From f1eabe26f5d20e31c29d90f16a3002f8395b5b85 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Fri, 8 Nov 2019 18:13:48 +0100
Subject: GRIFFON: More work on game states

---
 engines/griffon/dialogs.cpp | 2 +-
 engines/griffon/griffon.cpp | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'engines/griffon')

diff --git a/engines/griffon/dialogs.cpp b/engines/griffon/dialogs.cpp
index d149a8d199..094d88738a 100644
--- a/engines/griffon/dialogs.cpp
+++ b/engines/griffon/dialogs.cpp
@@ -186,7 +186,7 @@ void GriffonEngine::title(int mode) {
 
 						saveLoadNew();
 
-						if (_gameMode == kGameModeNewGame) {
+						if (_gameMode == kGameModeNewGame || _gameMode == kGameModeLoadGame) {
 							exitTitle = true;
 						}
 						break;
diff --git a/engines/griffon/griffon.cpp b/engines/griffon/griffon.cpp
index 264d0f0c6e..74517b47ae 100644
--- a/engines/griffon/griffon.cpp
+++ b/engines/griffon/griffon.cpp
@@ -157,9 +157,6 @@ Common::Error GriffonEngine::run() {
 			loadMap(_curMap);
 			mainLoop();
 		}
-
-		if (!_shouldQuit && _gameMode != kGameModeEnd)
-			saveLoadNew();
 	}
 
 	return Common::kNoError;
-- 
cgit v1.2.3