From 21b138add24e9b95e70adb267c35268de0f828d1 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Sun, 26 Apr 2015 00:50:00 +0200
Subject: 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.
---
 engines/sci/detection.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'engines/sci')

diff --git a/engines/sci/detection.cpp b/engines/sci/detection.cpp
index 85ff1c0062..e572e8ec7f 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
-- 
cgit v1.2.3