[Scummvm-git-logs] scummvm master -> bb1ad3f357f8d350ff2a8e517a6d729c2ca6bc3c

[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:
bb1ad3f357 MACGUI: don't activate menu if it is active


Commit: bb1ad3f357f8d350ff2a8e517a6d729c2ca6bc3c
    https://github.com/scummvm/scummvm/commit/bb1ad3f357f8d350ff2a8e517a6d729c2ca6bc3c
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-06-04T23:45:19+02:00

Commit Message:
MACGUI: don't activate menu if it is active

Changed paths:
    graphics/macgui/macwindowmanager.cpp


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