From db62ae8b332acf99e944d17e43b30485b153a6da Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 25 May 2009 13:40:46 +0000
Subject: Till we specify an common behavior when loading a game state on
 startup fails / the user tries to load an non existing save slot, change
 Tinsel to start up the game as if no slot was specified. (This 'fixes' bug
 #2796215 "DW: Black screen when loading via command line")

svn-id: r40890
---
 engines/tinsel/tinsel.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/tinsel/tinsel.cpp')

diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp
index a267a4ae44..5241459e9e 100644
--- a/engines/tinsel/tinsel.cpp
+++ b/engines/tinsel/tinsel.cpp
@@ -972,12 +972,12 @@ Common::Error TinselEngine::run() {
 
 	// Load game from specified slot, if any
 	//
-	// TODO: We might want to think about taking care of possible errors
-	// when loading the save state.
+	// TODO: We might want to think about properly taking care of possible
+	// errors when loading the save state.
 
 	if (ConfMan.hasKey("save_slot")) {
-		loadGameState(ConfMan.getInt("save_slot"));
-		loadingFromGMM = true;
+		if (loadGameState(ConfMan.getInt("save_slot")) == Common::kNoError)
+			loadingFromGMM = true;
 	}
 
 	// Foreground loop
-- 
cgit v1.2.3