From 4a4b69dbeb8656e9e1bef132afa1bb2c42c378a3 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 30 Jan 2010 23:40:29 +0000
Subject: Fixed loading of saved games

svn-id: r47729
---
 engines/sci/engine/savegame.cpp | 3 +--
 engines/sci/engine/vm.cpp       | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/sci/engine')

diff --git a/engines/sci/engine/savegame.cpp b/engines/sci/engine/savegame.cpp
index 848e2c3ebd..f8eddcdaa2 100644
--- a/engines/sci/engine/savegame.cpp
+++ b/engines/sci/engine/savegame.cpp
@@ -951,8 +951,7 @@ EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
 	
 #ifdef ENABLE_SCI32
 	// Copy the Gui32 pointer over to the new EngineState, if it exists
-	if (s->_gui32)
-		retval->_gui32 = s->_gui32;
+	retval->_gui32 = s->_gui32;
 #endif
 
 	// Copy some old data
diff --git a/engines/sci/engine/vm.cpp b/engines/sci/engine/vm.cpp
index af57bb88e9..984dd1f043 100644
--- a/engines/sci/engine/vm.cpp
+++ b/engines/sci/engine/vm.cpp
@@ -1043,6 +1043,7 @@ void run_vm(EngineState *s, int restoring) {
 							// place (i.e. menus have been constructed etc). Therefore, inject a kRestoreGame call
 							// here, instead of the requested function.
 							int saveSlot = g_loadFromLauncher;
+							g_loadFromLauncher = -1;	// invalidate slot, so that we don't load again
 
 							if (saveSlot < 0)
 								error("Requested to load invalid save slot");	// should never happen, really
-- 
cgit v1.2.3