[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.290,2.291

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv3136

Modified Files:
	scummvm.cpp 
Log Message:
fix for bug #758542

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.290
retrieving revision 2.291
diff -u -d -r2.290 -r2.291
--- scummvm.cpp	20 Jul 2003 00:02:24 -0000	2.290
+++ scummvm.cpp	20 Jul 2003 01:09:42 -0000	2.291
@@ -1624,13 +1624,13 @@
 			_videoFinished = true;
 		} else
 			abortCutscene();
-	} else if (_lastKeyHit == saveloadkey && _currentRoom != 0) {
-		if (VAR_SAVELOAD_SCRIPT != 0xFF)
+	} else if (_lastKeyHit == saveloadkey) {
+		if (VAR_SAVELOAD_SCRIPT != 0xFF && _currentRoom != 0)
 			runScript(VAR(VAR_SAVELOAD_SCRIPT), 0, 0, 0);
 
 		saveloadDialog();		// Display NewGui
 
-		if (VAR_SAVELOAD_SCRIPT != 0xFF)
+		if (VAR_SAVELOAD_SCRIPT != 0xFF && _currentRoom != 0)
 			runScript(VAR(VAR_SAVELOAD_SCRIPT2), 0, 0, 0);
 		return;
 	} else if (VAR_TALKSTOP_KEY != 0xFF && _lastKeyHit == VAR(VAR_TALKSTOP_KEY)) {