[Scummvm-git-logs] scummvm master -> 488c86c320bf81ef55b4184233729533979e4e7d

[dreammaster]

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

Summary:
488c86c320 M4: RIDDLE: Fix selecting travel destination from George in room 301


Commit: 488c86c320bf81ef55b4184233729533979e4e7d
    https://github.com/scummvm/scummvm/commit/488c86c320bf81ef55b4184233729533979e4e7d
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-10-23T22:58:37-07:00

Commit Message:
M4: RIDDLE: Fix selecting travel destination from George in room 301

Changed paths:
    engines/m4/riddle/rooms/section3/room301.cpp


diff --git a/engines/m4/riddle/rooms/section3/room301.cpp b/engines/m4/riddle/rooms/section3/room301.cpp
index 5a9af509e06..9eeefc0ec15 100644
--- a/engines/m4/riddle/rooms/section3/room301.cpp
+++ b/engines/m4/riddle/rooms/section3/room301.cpp
@@ -111,14 +111,17 @@ void Room301::daemon() {
 		break;
 
 	case 10:
-		if (_georgeShould == 0 && _georgeMode == 0 && _trigger1 != -1) {
-			kernel_trigger_dispatchx(_trigger1);
-			_trigger1 = -1;
-
-			if (_showWalkerFlag) {
-				ws_unhide_walker();
-				_showWalkerFlag = false;
+		if (_georgeShould == 0 && _georgeMode == 0) {
+			if (_trigger1 != -1) {
+				kernel_trigger_dispatchx(_trigger1);
+				_trigger1 = -1;
+
+				if (_showWalkerFlag) {
+					ws_unhide_walker();
+					_showWalkerFlag = false;
+				}
 			}
+
 			if (_convResumeFlag) {
 				conv_resume();
 				_convResumeFlag = false;