From 03d7990a341a5c05d2b23b073620159d3fe15a0f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Tue, 31 Jul 2007 17:41:10 +0000
Subject: Some updates to the psychic profile in IHNM. sfPsychicProfileOff has
 been enabled again

svn-id: r28361
---
 engines/saga/interface.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engines/saga/interface.cpp')

diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index c7054436d9..941262e10e 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -369,18 +369,18 @@ int Interface::deactivate() {
 }
 
 void Interface::rememberMode() {
-	assert (_savedMode == -1);
+	debug(1, "rememberMode(%d)", _savedMode);
 
 	_savedMode = _panelMode;
-
-	debug(1, "rememberMode(%d)", _savedMode);
 }
 
 void Interface::restoreMode(bool draw_) {
-	assert (_savedMode != -1);
-
 	debug(1, "restoreMode(%d)", _savedMode);
 
+	// If _savedMode is -1 by a race condition, set it to kPanelMain
+	if (_savedMode == -1)
+		_savedMode = kPanelMain;
+
 	_panelMode = _savedMode;
 	_savedMode = -1;
 
-- 
cgit v1.2.3