[Scummvm-git-logs] scummvm master -> 37744bc7bfb8a5079aa6c5cd7ace2ba444d5b35d

[sev-]

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:
37744bc7bf GRAPHICS: MACGUI: Properly fix double activation of menu


Commit: 37744bc7bfb8a5079aa6c5cd7ace2ba444d5b35d
    https://github.com/scummvm/scummvm/commit/37744bc7bfb8a5079aa6c5cd7ace2ba444d5b35d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-06-10T15:37:51+02:00

Commit Message:
GRAPHICS: MACGUI: Properly fix double activation of menu

Changed paths:
    graphics/macgui/macwindowmanager.cpp


diff --git a/graphics/macgui/macwindowmanager.cpp b/graphics/macgui/macwindowmanager.cpp
index 7bf9eee595..526f8b17c0 100644
--- a/graphics/macgui/macwindowmanager.cpp
+++ b/graphics/macgui/macwindowmanager.cpp
@@ -261,7 +261,7 @@ MacMenu *MacWindowManager::addMenu() {
 }
 
 void MacWindowManager::activateMenu() {
-	if (!_menu || _menu->isVisible())
+	if (!_menu || ((_mode & kWMModeAutohideMenu) && _menu->isVisible()))
 		return;
 
 	if (_mode & kWMModalMenuMode) {