Fix Escape in the intro, and switching map and the inventory

svn-id: r45389

1 files changed, 8 insertions, 2 deletions

diff --git a/engines/draci/game.cpp b/engines/draci/game.cpp
index da94c261d3..f771c564f0 100644
--- a/engines/draci/game.cpp
+++ b/engines/draci/game.cpp
@@ -144,13 +144,19 @@ void Game::start() {
 	while (!shouldQuit()) {
 		debugC(1, kDraciGeneralDebugLevel, "Game::start()");
 
-		const bool force_reload = shouldExitLoop() > 1;
-
 		// Whenever the top-level loop is entered, it should not finish unless
 		// the exit is triggered by a script
 		_shouldExitLoop = false;
+		_vm->_script->endCurrentProgram(false);
 
+		const bool force_reload = shouldExitLoop() > 1;
 		enterNewRoom(force_reload);
+
+		if (_vm->_script->shouldEndProgram()) {
+			// Room changed during the initialization (intro or Escape pressed).
+			continue;
+		}
+
 		loop();
 	}
 }