[Scummvm-cvs-logs] scummvm master -> b5b5417d64eacd21d441631e7a5e0c618bfadebd

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b5b5417d64 QUEEN: Allow the engine to quit while dialog options are shown


Commit: b5b5417d64eacd21d441631e7a5e0c618bfadebd
    https://github.com/scummvm/scummvm/commit/b5b5417d64eacd21d441631e7a5e0c618bfadebd
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-10-27T03:36:52+02:00

Commit Message:
QUEEN: Allow the engine to quit while dialog options are shown

Changed paths:
    engines/queen/talk.cpp



diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp
index d00e64b..e86a53d 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();