[Scummvm-git-logs] scummvm master -> 890adf6e3ae40d2b9321fe0eba3907c74ace9fd9

[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:
890adf6e3a GRAPHICS: MACGUI: Fix menu re-entrance


Commit: 890adf6e3ae40d2b9321fe0eba3907c74ace9fd9
    https://github.com/scummvm/scummvm/commit/890adf6e3ae40d2b9321fe0eba3907c74ace9fd9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-03T10:03:02+02:00

Commit Message:
GRAPHICS: MACGUI: Fix menu re-entrance

Changed paths:
    graphics/macgui/macmenu.cpp


diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 806522f..114f56a 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -821,6 +821,7 @@ bool MacMenu::mouseClick(int x, int y) {
 				_activeSubItem = -1;
 				if (_items[_activeItem]->submenu != nullptr) {
 					_menustack.push_back(_items[_activeItem]->submenu);
+					_items[_activeItem]->submenu->highlight = -1;
 				}
 
 				_menuActivated = true;
@@ -933,6 +934,7 @@ bool MacMenu::mouseRelease(int x, int y) {
 
 		_activeItem = -1;
 		_activeSubItem = -1;
+		_menustack.clear();
 
 		_wm->setFullRefresh(true);