From 87dc3689aa8f245ceb3b1b7ff614c107cd81a414 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Wed, 2 Oct 2019 13:47:04 +0200
Subject: GRAPHICS: MACGUI: Fix and simplify nested submenu reading

---
 graphics/macgui/macmenu.cpp | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'graphics/macgui/macmenu.cpp')

diff --git a/graphics/macgui/macmenu.cpp b/graphics/macgui/macmenu.cpp
index 839404de81..91c01e0983 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;
 			}
-- 
cgit v1.2.3