[Scummvm-cvs-logs] scummvm master -> c34704972ece95bfbcf0c0837cf5b8102387194d

[bluegr]

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:
c34704972e SCI: reset _throttleLastTime when restarting


Commit: c34704972ece95bfbcf0c0837cf5b8102387194d
    https://github.com/scummvm/scummvm/commit/c34704972ece95bfbcf0c0837cf5b8102387194d
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2012-11-06T02:58:33-08:00

Commit Message:
SCI: reset _throttleLastTime when restarting

This ensures that the load dialog in the ScummVM menu won't be
available at inappropriate times when a game is restarting (e.g QFG1,
during the starting warning dialogs - bug #3565505)

Changed paths:
    engines/sci/sci.cpp



diff --git a/engines/sci/sci.cpp b/engines/sci/sci.cpp
index 15b18ce..118f7d9 100644
--- a/engines/sci/sci.cpp
+++ b/engines/sci/sci.cpp
@@ -699,6 +699,7 @@ void SciEngine::runGame() {
 			patchGameSaveRestore();
 			setLauncherLanguage();
 			_gamestate->gameIsRestarting = GAMEISRESTARTING_RESTART;
+			_gamestate->_throttleLastTime = 0;
 			if (_gfxMenu)
 				_gfxMenu->reset();
 			_gamestate->abortScriptProcessing = kAbortNone;