WINTERMUTE: Respect EVENT_QUIT properly (and don't ask to quit anymore)

scummvm · Jul 27, 2013 · 28b8537 · 28b8537
1 parent b43bac6
commit 28b8537
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/engines/wintermute/platform_osystem.cpp b/engines/wintermute/platform_osystem.cpp
@@ -125,9 +125,12 @@ void BasePlatform::handleEvent(Common::Event *event) {
 //			_gameRef->AutoSaveOnExit();
 //			_gameRef->_quitting = true;
 //		}
-		if (_gameRef) {
-			_gameRef->onWindowClose();
-		}
+
+// The engine CAN query for closing, but we disable it for now, as the EVENT_QUIT-event
+// can't be stopped.
+//		if (_gameRef) {
+//			_gameRef->onWindowClose();
+//		}
 		break;
 	default:
 		// TODO: Do we care about any other events?

diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp
@@ -250,6 +250,9 @@ int WintermuteEngine::messageLoop() {
 			}
 			prevTime = time;
 		}
+		if (shouldQuit()) {
+			break;
+		}
 		if (_game && _game->_quitting) {
 			break;
 		}