[Scummvm-git-logs] scummvm master -> 87dc3689aa8f245ceb3b1b7ff614c107cd81a414

[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:
87dc3689aa GRAPHICS: MACGUI: Fix and simplify nested submenu reading


Commit: 87dc3689aa8f245ceb3b1b7ff614c107cd81a414
    https://github.com/scummvm/scummvm/commit/87dc3689aa8f245ceb3b1b7ff614c107cd81a414
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-02T13:47:04+02:00

Commit Message:
GRAPHICS: MACGUI: Fix and simplify nested submenu reading

Changed paths:
    graphics/macgui/macmenu.cpp


diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 839404d..91c01e0 100644
--- a/graphics/macgui/macmenu.cpp
+++ b/graphics/macgui/macmenu.cpp
@@ -231,19 +231,15 @@ MacMenu *MacMenu::createMenuFromPEexe(Common::PEResources &exe, MacWindowManager
 		if (flags & kPopUp) {
 			if (depth == 0) {
 				menu->addMenuItem(readUnicodeString(menuData));
-
-				MacMenuSubMenu *submenu = menu->addSubMenu(nullptr);
-				menus.push(submenu);
 			} else {
-				MacMenuSubMenu *submenu = menu->addSubMenu(menus.size() ? menus.top() : nullptr);
-
-				menus.push(submenu);
-
 				Common::U32String name = readUnicodeString(menuData);
-				menu->addSubMenuItem(submenu, name, action);
+				menu->addSubMenuItem(menus.top(), name, action);
 				action++;
 			}
 
+			MacMenuSubMenu *submenu = menu->addSubMenu(menus.size() ? menus.top() : nullptr);
+			menus.push(submenu);
+
 			if (lastPopUp) {
 				lastPopUpCopy = lastPopUp;
 			}