[Scummvm-git-logs] scummvm branch-2-3 -> e77a7fe24bacbb3907b54975fc9511efb4ef3f94

criezy criezy at scummvm.org
Mon Sep 6 19:01:52 UTC 2021


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:
e77a7fe24b STARK: Fix in-game quit option not respecting the Always RTL option


Commit: e77a7fe24bacbb3907b54975fc9511efb4ef3f94
    https://github.com/scummvm/scummvm/commit/e77a7fe24bacbb3907b54975fc9511efb4ef3f94
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-09-06T20:00:47+01:00

Commit Message:
STARK: Fix in-game quit option not respecting the Always RTL option

This was due to the engine both exiting immediately from the game loop
and pushing a QUIT_EVENT (through the call to quitGame()). This meant
that that QUIT_EVENT was processed only after the game had already
returned to the launcher, causing the launcher to close.

This fixes bug #12904

Changed paths:
    engines/stark/stark.cpp


diff --git a/engines/stark/stark.cpp b/engines/stark/stark.cpp
index 412f5d7f3b..d1198455b1 100644
--- a/engines/stark/stark.cpp
+++ b/engines/stark/stark.cpp
@@ -153,10 +153,8 @@ void StarkEngine::mainLoop() {
 
 		processEvents();
 
-		if (StarkUserInterface->shouldExit()) {
-			quitGame();
+		if (StarkUserInterface->shouldExit())
 			break;
-		}
 
 		if (StarkResourceProvider->hasLocationChangeRequest()) {
 			StarkGlobal->setNormalSpeed();




More information about the Scummvm-git-logs mailing list