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

[wjp]

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:
e5a6b7b16c DREAMWEB: Fix regression in hangOnPQ (in conversations)


Commit: e5a6b7b16cd2ad16d5832901443492b1286c3dcc
    https://github.com/scummvm/scummvm/commit/e5a6b7b16cd2ad16d5832901443492b1286c3dcc
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-12-08T23:04:17-08:00

Commit Message:
DREAMWEB: Fix regression in hangOnPQ (in conversations)

Changed paths:
    engines/dreamweb/stubs.cpp



diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index d2bf523..3e37e55 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -4097,12 +4097,13 @@ void DreamGenContext::hangOnPQ() {
 		dumpTextLine();
 		checkCoords(quitList);
 
-		if (data.byte(kGetback) == 1 || !data.byte(kQuitrequested)) {
+		if (data.byte(kGetback) == 1 || data.byte(kQuitrequested)) {
 			// Quit conversation
 			delPointer();
 			data.byte(kPointermode) = 0;
 			cancelCh1();
 			flags._c = true;
+			return;
 		}
 
 		if (data.byte(kSpeechloaded) == 1 && data.byte(kCh1playing) == 255) {