From 0015657caad6d4824a3b146fb34c4255aeeff72b Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Thu, 12 Feb 2009 15:13:52 +0000
Subject: Fix for bug #2541237 - "AGI: Restart quits ScummVM"

svn-id: r36279
---
 engines/agi/keyboard.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/agi/keyboard.cpp')

diff --git a/engines/agi/keyboard.cpp b/engines/agi/keyboard.cpp
index 5525cfef99..d98e58d4d9 100644
--- a/engines/agi/keyboard.cpp
+++ b/engines/agi/keyboard.cpp
@@ -374,7 +374,7 @@ int AgiEngine::waitKey() {
 	}
 
 	debugC(3, kDebugLevelInput, "waiting...");
-	while (!shouldQuit()) {
+	while (!(shouldQuit() || restartGame)) {
 		_gfx->pollTimer();	/* msdos driver -> does nothing */
 		key = doPollKeyboard();
 		if (key == KEY_ENTER || key == KEY_ESCAPE || key == BUTTON_LEFT)
@@ -397,7 +397,7 @@ int AgiEngine::waitAnyKey() {
 	}
 
 	debugC(3, kDebugLevelInput, "waiting...");
-	while (!shouldQuit()) {
+	while (!(shouldQuit() || restartGame)) {
 		_gfx->pollTimer();	/* msdos driver -> does nothing */
 		key = doPollKeyboard();
 		if (key)
-- 
cgit v1.2.3