[Scummvm-git-logs] scummvm master -> 74d5d2c81b6791dd89dc877544e831a941230915

AndywinXp noreply at scummvm.org
Sat Nov 25 11:25:15 UTC 2023


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:
74d5d2c81b SCUMM: COMI: Fix erratic quit confirmation behavior


Commit: 74d5d2c81b6791dd89dc877544e831a941230915
    https://github.com/scummvm/scummvm/commit/74d5d2c81b6791dd89dc877544e831a941230915
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-11-25T12:25:08+01:00

Commit Message:
SCUMM: COMI: Fix erratic quit confirmation behavior

Changed paths:
    engines/scumm/gfx_gui.cpp


diff --git a/engines/scumm/gfx_gui.cpp b/engines/scumm/gfx_gui.cpp
index 7b9a2edbf7a..222e546ec63 100644
--- a/engines/scumm/gfx_gui.cpp
+++ b/engines/scumm/gfx_gui.cpp
@@ -846,7 +846,7 @@ int ScummEngine::getInternalGUIControlFromCoordinates(int x, int y) {
 #ifdef ENABLE_SCUMM_7_8
 void ScummEngine_v7::queryQuit(bool returnToLauncher) {
 	if (isUsingOriginalGUI()) {
-		if (_quitFromScriptCmd) {
+		if (_quitFromScriptCmd && !(_game.version == 8 && _currentRoom == 92)) {
 			_quitByGUIPrompt = true;
 			if (returnToLauncher) {
 				Common::Event event;




More information about the Scummvm-git-logs mailing list