[Scummvm-git-logs] scummvm master -> d4747813c40e820dc31f06dd9e752964752bcb19

[sev-]

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

Summary:
9850022ac5 DIRECTOR: Fix warnings
d4747813c4 GRAPHICS: MACGUI: Fix regression with text autoselect


Commit: 9850022ac5bb5b18c586169930e6b894c6838f4d
    https://github.com/scummvm/scummvm/commit/9850022ac5bb5b18c586169930e6b894c6838f4d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-11-06T01:01:43+01:00

Commit Message:
DIRECTOR: Fix warnings

Changed paths:
    engines/director/debugger/dt-score.cpp
    engines/director/sound.cpp


diff --git a/engines/director/debugger/dt-score.cpp b/engines/director/debugger/dt-score.cpp
index 9ae27d8fd2e..48daf2dd919 100644
--- a/engines/director/debugger/dt-score.cpp
+++ b/engines/director/debugger/dt-score.cpp
@@ -707,7 +707,7 @@ void showScore() {
 
 		{  // Render pagination
 			ImGui::BeginDisabled(numFrames <= FRAME_PAGE_SIZE);
-			ImGui::Text("   Jump to frame:", numFrames);
+			ImGui::Text("   Jump to frame:");
 			ImGui::SameLine();
 			ImGui::SliderInt("##scorepage", &_state->_scorePageSlider, 0, numFrames / FRAME_PAGE_SIZE, "%d00");
 			_state->_scoreFrameOffset = _state->_scorePageSlider * FRAME_PAGE_SIZE + 1;
diff --git a/engines/director/sound.cpp b/engines/director/sound.cpp
index 6112581f033..0e93ad4fa8c 100644
--- a/engines/director/sound.cpp
+++ b/engines/director/sound.cpp
@@ -767,7 +767,7 @@ void DirectorSound::processCuePoints() {
 			for (uint i = channel->lastCuePointIndex + 1; i < soundCast->_cuePoints.size(); i++) {
 				int32 cuePoint = soundCast->_cuePoints[i];
 
-				if (cuePoint > elapsedTime)
+				if (cuePoint > (int32)elapsedTime)
 					break;
 
 				debugC(5, kDebugSound, "DirectorSound::processCuePoints(): cue point %d reached on channel %d", cuePoint, it._key);


Commit: d4747813c40e820dc31f06dd9e752964752bcb19
    https://github.com/scummvm/scummvm/commit/d4747813c40e820dc31f06dd9e752964752bcb19
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-11-06T01:01:43+01:00

Commit Message:
GRAPHICS: MACGUI: Fix regression with text autoselect

Changed paths:
    graphics/macgui/mactext.cpp


diff --git a/graphics/macgui/mactext.cpp b/graphics/macgui/mactext.cpp
index f54d31afa26..1c41a6ac4c4 100644
--- a/graphics/macgui/mactext.cpp
+++ b/graphics/macgui/mactext.cpp
@@ -718,9 +718,12 @@ void MacText::setActive(bool active) {
 	g_system->getTimerManager()->removeTimerProc(&cursorTimerHandler);
 	if (_active && _editable) {
 		g_system->getTimerManager()->installTimerProc(&cursorTimerHandler, 200000, this, "macEditableText");
-		// inactive -> active, we reset the selection
-		setSelection(_selStart, true);
-		setSelection(_selEnd, false);
+
+		if (_autoSelect) {
+			// inactive -> active, we reset the selection
+			setSelection(_selStart, true);
+			setSelection(_selEnd, false);
+		}
 	} else {
 		// clear the selection and cursor
 		_selectedText.endY = -1;