Start of fixing bug #2537054: "AGI: Using GMM to load causes graphics glitches"

The engine still crashes when load from GMM occured with a text box on screen.

svn-id: r40733

1 files changed, 14 insertions, 1 deletions

diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp
index 1b694e711c..bd0a0a5112 100644
--- a/engines/agi/saveload.cpp
+++ b/engines/agi/saveload.cpp
@@ -613,6 +613,16 @@ int AgiEngine::selectSlot() {
 
 		_gfx->pollTimer();	/* msdos driver -> does nothing */
 		key = doPollKeyboard();
+
+		// It may happen that somebody will open GMM while
+		// this dialog is open, and load a game
+		// We are processing it here, effectively jumping
+		// out of the dead loop
+		if (getflag(fRestoreJustRan)) {
+			rc = -2;
+			goto getout;
+		}
+
 		switch (key) {
 		case KEY_ENTER:
 			rc = active;
@@ -724,6 +734,7 @@ press:
 
 getout:
 	closeWindow();
+
 	return rc;
 }
 
@@ -844,7 +855,9 @@ int AgiEngine::loadGameDialog() {
 	slot = selectSlot();
 
 	if (slot < 0) {
-		messageBox("Game NOT restored.");
+		if (slot == -1) // slot = -2 when GMM was launched
+			messageBox("Game NOT restored.");
+
 		return errOK;
 	}