[Scummvm-git-logs] scummvm master -> b60a4e57705713bdb0a0e6d9c88f8909e6b8ad6f

[digitall]

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:
b60a4e5770 AGI: Fix ScummVM Quit if Return To Launcher from AGI Quit Dialog.


Commit: b60a4e57705713bdb0a0e6d9c88f8909e6b8ad6f
    https://github.com/scummvm/scummvm/commit/b60a4e57705713bdb0a0e6d9c88f8909e6b8ad6f
Author: D G Turner (digitall at scummvm.org)
Date: 2018-10-10T07:25:50+01:00

Commit Message:
AGI: Fix ScummVM Quit if Return To Launcher from AGI Quit Dialog.

This is bug Trac #10735.

Changed paths:
    engines/agi/systemui.cpp


diff --git a/engines/agi/systemui.cpp b/engines/agi/systemui.cpp
index c7ca7cd..4698b75 100644
--- a/engines/agi/systemui.cpp
+++ b/engines/agi/systemui.cpp
@@ -872,7 +872,7 @@ bool SystemUI::askForVerification(const char *verifyText, const char *button1Tex
 
 	_text->closeWindow();
 
-	if (_askForVerificationCancelled)
+	if (_askForVerificationCancelled || _vm->shouldQuit())
 		return false;
 	return true;
 }