[Scummvm-git-logs] scummvm master -> 15c477d631ff8dac78368b21d61831746b4c4a37

[antoniou79]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
15c477d631 SHERLOCK: ROSETATTOO: Don't attempt to split tooltip at trailing space


Commit: 15c477d631ff8dac78368b21d61831746b4c4a37
    https://github.com/scummvm/scummvm/commit/15c477d631ff8dac78368b21d61831746b4c4a37
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2026-02-28T12:52:19+02:00

Commit Message:
SHERLOCK: ROSETATTOO: Don't attempt to split tooltip at trailing space

Fixes bug #16580

Changed paths:
    engines/sherlock/tattoo/widget_inventory.cpp


diff --git a/engines/sherlock/tattoo/widget_inventory.cpp b/engines/sherlock/tattoo/widget_inventory.cpp
index 52a2dd7e2c5..04e04106d6e 100644
--- a/engines/sherlock/tattoo/widget_inventory.cpp
+++ b/engines/sherlock/tattoo/widget_inventory.cpp
@@ -63,7 +63,14 @@ void WidgetInventoryTooltip::setText(const Common::String &str) {
 		while (*s) {
 			s = strchr(s, ' ');
 
-			if (!s) {
+			// Some constructed sentences end with a trailing space character,
+			// eg. "Show Permission to Dressing Screen "
+			// so we need to check for that case here too and end the line splitting iterations.
+			// Any line splitting should have been made by now anyway.
+			// Note that it should be valid to look at the character after the space *(s+1),
+			// since if the space was a trailing space, it *should* be followed by a null terminator.
+			// Fixes bug #16580
+			if (!s || !(*(s + 1))) {
 				if (!space) {
 					height = _surface.stringHeight(str) + 2;
 				} else {