[Scummvm-git-logs] scummvm master -> 905c30b742db1b799ff6cc12ca1ddd9d716f842c

[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:
905c30b742 SCUMM: MACGUI: Ignore Mac events while there is a banner displayed


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

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

This is so that we can't do something like opening a dialog using its
keyboard shortcut while the game is paused.

Changed paths:
    engines/scumm/macgui/macgui_impl.cpp


diff --git a/engines/scumm/macgui/macgui_impl.cpp b/engines/scumm/macgui/macgui_impl.cpp
index 03cacdcffbb..5c36544de36 100644
--- a/engines/scumm/macgui/macgui_impl.cpp
+++ b/engines/scumm/macgui/macgui_impl.cpp
@@ -87,6 +87,12 @@ void MacGuiImpl::setPalette(const byte *palette, uint size) {
 }
 
 bool MacGuiImpl::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 (_bannerWindow)
+		return false;
+
 	return _windowManager->processEvent(event);
 }