[Scummvm-git-logs] scummvm branch-2-8 -> aecad9cc7b6ee95200d6bf64f6923e27a240086e

[eriktorbjorn]

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:
aecad9cc7b SCUMM: MACGUI: Ignore Mac events while there is a message banner


Commit: aecad9cc7b6ee95200d6bf64f6923e27a240086e
    https://github.com/scummvm/scummvm/commit/aecad9cc7b6ee95200d6bf64f6923e27a240086e
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2024-03-15T17:37:01+01:00

Commit Message:
SCUMM: MACGUI: Ignore Mac events while there is a message banner

Backported from master. We don't want the player opening a dialog with
its shortcut key while the game is paused, for instance.

Changed paths:
    engines/scumm/gfx_mac.cpp


diff --git a/engines/scumm/gfx_mac.cpp b/engines/scumm/gfx_mac.cpp
index de011e0994a..924cb2dcdc7 100644
--- a/engines/scumm/gfx_mac.cpp
+++ b/engines/scumm/gfx_mac.cpp
@@ -2514,6 +2514,11 @@ void MacGui::setPalette(const byte *palette, uint size) {
 }
 
 bool MacGui::handleEvent(Common::Event &event) {
+	// The situation we're trying to avoid here is the user opening e.g.
+	// the save dialog using keyboard shortcuts while the game is paused.
+	if (_vm->_messageBannerActive)
+		return false;
+
 	return _windowManager->processEvent(event);
 }