[Scummvm-git-logs] scummvm branch-2-7 -> c44c2c54a1018372c615f54d3dfc48136c04db8e

[AndywinXp]

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

Summary:
82884f1cbd ENGINES: Add empty() method to the ChainedGamesManager class
c44c2c54a1 SCUMM: DOTT: Fix quit prompt appearing when using the PC in Ed's room


Commit: 82884f1cbd75e290e403f28784677ecaacce7fa3
    https://github.com/scummvm/scummvm/commit/82884f1cbd75e290e403f28784677ecaacce7fa3
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-01-28T10:19:06+01:00

Commit Message:
ENGINES: Add empty() method to the ChainedGamesManager class

Changed paths:
    engines/engine.h


diff --git a/engines/engine.h b/engines/engine.h
index 0caa0375059..4bbc4c4a86e 100644
--- a/engines/engine.h
+++ b/engines/engine.h
@@ -688,6 +688,8 @@ public:
 	void push(const Common::String target, const int slot = -1);
 	/** Pop the last game loaded into the chained games manager. */
 	bool pop(Common::String &target, int &slot);
+	/** Returns true if the chained games manager has no elements in the queue. */
+	bool empty() { return _chainedGames.empty(); }
 };
 
 /** Convenience shortcut for accessing the chained games manager. */


Commit: c44c2c54a1018372c615f54d3dfc48136c04db8e
    https://github.com/scummvm/scummvm/commit/c44c2c54a1018372c615f54d3dfc48136c04db8e
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-01-28T10:19:07+01:00

Commit Message:
SCUMM: DOTT: Fix quit prompt appearing when using the PC in Ed's room

This only affects the original GUI mode, and leaves the other mode as it has always been; also,
the issue only appeared when the global configuration parameter "confirm_exit" was set to true.

Changed paths:
    engines/scumm/gfx_gui.cpp


diff --git a/engines/scumm/gfx_gui.cpp b/engines/scumm/gfx_gui.cpp
index 734db7c2c77..e1c2c600ce7 100644
--- a/engines/scumm/gfx_gui.cpp
+++ b/engines/scumm/gfx_gui.cpp
@@ -1511,7 +1511,7 @@ void ScummEngine::queryQuit(bool returnToLauncher) {
 
 		// "Are you sure you want to quit?  (Y/N)"
 		Common::KeyState ks;
-		if (ConfMan.hasKey("confirm_exit") && ConfMan.getBool("confirm_exit")) {
+		if (ConfMan.hasKey("confirm_exit") && ConfMan.getBool("confirm_exit") && ChainedGamesMan.empty()) {
 			_system->setFeatureState(OSystem::kFeatureVirtualKeyboard, true);
 
 			if (_game.version > 4) {