[Scummvm-cvs-logs] scummvm master -> 404839bda620e27e99d4e9052ff02cbeb40406df

[eriktorbjorn]

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:
404839bda6 TOON: Check for quitting in runEventScript()


Commit: 404839bda620e27e99d4e9052ff02cbeb40406df
    https://github.com/scummvm/scummvm/commit/404839bda620e27e99d4e9052ff02cbeb40406df
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-05-15T11:13:13+02:00

Commit Message:
TOON: Check for quitting in runEventScript()

This keeps the game from hanging when trying to quit during Jim's
gym demonstration. Hopefully any other effect of it is also good.

Changed paths:
    engines/toon/toon.cpp



diff --git a/engines/toon/toon.cpp b/engines/toon/toon.cpp
index 09f865f..9e2905f 100644
--- a/engines/toon/toon.cpp
+++ b/engines/toon/toon.cpp
@@ -1785,7 +1785,7 @@ int32 ToonEngine::runEventScript(int32 x, int32 y, int32 mode, int32 id, int32 s
 	_currentScriptRegion++;
 
 	_script->start(status, 1);
-	while (_script->run(status))
+	while (_script->run(status) && !_shouldQuit)
 		waitForScriptStep();
 
 	_currentScriptRegion--;