[Scummvm-cvs-logs] scummvm master -> 21b138add24e9b95e70adb267c35268de0f828d1

[wjp]

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:
21b138add2 Revert "SCI: Hopefully fix bug #3565505 - "SCI : crash when loading a savegame""


Commit: 21b138add24e9b95e70adb267c35268de0f828d1
    https://github.com/scummvm/scummvm/commit/21b138add24e9b95e70adb267c35268de0f828d1
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2015-04-26T00:51:31+02:00

Commit Message:
Revert "SCI: Hopefully fix bug #3565505 - "SCI : crash when loading a savegame""

This reverts commit 76ff4c700166d69b416dae324ee616ab57265c34.

It was intended to fix bug #6136, but only worked around the actual
problem in some cases. See 4c03e4b699916a9b9fe71afffaf41c283045216e.

Changed paths:
    engines/sci/detection.cpp



diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 85ff1c0..e572e8e 100644
--- a/engines/sci/detection.cpp
+++ b/engines/sci/detection.cpp
@@ -834,16 +834,12 @@ Common::Error SciEngine::saveGameState(int slot, const Common::String &desc) {
 	return Common::kNoError;
 }
 
-// Before enabling the load option in the ScummVM menu, the main game loop must
-// have run at least once. When the game loop runs, kGameIsRestarting is invoked,
-// thus the speed throttler is initialized. Hopefully fixes bug #3565505.
-
 bool SciEngine::canLoadGameStateCurrently() {
-	return !_gamestate->executionStackBase && (_gamestate->_throttleLastTime > 0 || _gamestate->_throttleTrigger);
+	return !_gamestate->executionStackBase;
 }
 
 bool SciEngine::canSaveGameStateCurrently() {
-	return !_gamestate->executionStackBase && (_gamestate->_throttleLastTime > 0 || _gamestate->_throttleTrigger);
+	return !_gamestate->executionStackBase;
 }
 
 } // End of namespace Sci