[Scummvm-git-logs] scummvm branch-2-9 -> aea70dd7a14234d9d37555a80157597b2e12aa98

[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:
aea70dd7a1 SCUMM: MACGUI: Disable Mac GUI while the game is showing a banner


Commit: aea70dd7a14234d9d37555a80157597b2e12aa98
    https://github.com/scummvm/scummvm/commit/aea70dd7a14234d9d37555a80157597b2e12aa98
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2025-01-01T01:01:23+01:00

Commit Message:
SCUMM: MACGUI: Disable Mac GUI while the game is showing a banner

This is backported from pull request 6326 ("Implement Macintosh GUI for
the remaining SCUMM games") and prevents bad behavior e.g. when saving
or loading while the game is paused. Probably not even worth mentioning
in the NEWS.

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 5c584153f05..a7f82634695 100644
--- a/engines/scumm/macgui/macgui_impl.cpp
+++ b/engines/scumm/macgui/macgui_impl.cpp
@@ -107,7 +107,7 @@ 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)
+	if (_bannerWindow || _vm->_messageBannerActive)
 		return false;
 
 	return _windowManager->processEvent(event);