[Scummvm-cvs-logs] scummvm master -> 28b85375306e08a04360dacf070c496dc5d1dbd2

[somaen]

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:
28b8537530 WINTERMUTE: Respect EVENT_QUIT properly (and don't ask to quit anymore)


Commit: 28b85375306e08a04360dacf070c496dc5d1dbd2
    https://github.com/scummvm/scummvm/commit/28b85375306e08a04360dacf070c496dc5d1dbd2
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-07-27T12:40:27-07:00

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

Changed paths:
    engines/wintermute/platform_osystem.cpp
    engines/wintermute/wintermute.cpp



diff --git a/engines/wintermute/platform_osystem.cpp b/engines/wintermute/platform_osystem.cpp
index 362c0da..8b1a6e3 100644
--- 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
index 19848b0..202b261 100644
--- 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;
 		}