From b5b5417d64eacd21d441631e7a5e0c618bfadebd Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Mon, 27 Oct 2014 03:36:52 +0200
Subject: QUEEN: Allow the engine to quit while dialog options are shown

---
 engines/queen/talk.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'engines/queen')

diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp
index d00e64b777..e86a53d448 100644
--- a/engines/queen/talk.cpp
+++ b/engines/queen/talk.cpp
@@ -189,7 +189,7 @@ void Talk::talk(const char *filename, int personInRoom, char *cutawayFilename) {
 			}
 		}
 
-		if (_vm->input()->talkQuit())
+		if (_vm->input()->talkQuit() || _vm->shouldQuit())
 			break;
 
 		retval   = _dialogueTree[level][selectedSentence].dialogueNodeValue1;
@@ -1255,11 +1255,7 @@ int16 Talk::selectSentence() {
 		if (sentenceCount > 0) {
 			int oldZone = 0;
 
-			while (0 == selectedSentence) {
-
-				if (_vm->input()->talkQuit())
-					break;
-
+			while (0 == selectedSentence && !_vm->input()->talkQuit() && !_vm->shouldQuit()) {
 				_vm->update();
 
 				Common::Point mouse = _vm->input()->getMousePos();
-- 
cgit v1.2.3