macOS: Prevent mac menu bar submenus with empty names being used as t…

…he recent items menu
juce-framework · Jun 18, 2019 · b0934f8 · b0934f8
1 parent 5360191
commit b0934f8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/modules/juce_gui_basics/native/juce_mac_MainMenu.mm b/modules/juce_gui_basics/native/juce_mac_MainMenu.mm
@@ -249,10 +249,10 @@ void addMenuItem (PopupMenu::MenuItemIterator& iter, NSMenu* menuToAddTo,
         }
         else if (i.subMenu != nullptr)
         {
-            if (i.text == recentItemsMenuName)
+            if (recentItemsMenuName.isNotEmpty() && i.text == recentItemsMenuName)
             {
                 if (recent == nullptr)
-                    recent.reset (new RecentFilesMenuItem());
+                    recent = std::make_unique<RecentFilesMenuItem>();
 
                 if (recent->recentItem != nil)
                 {
@@ -572,7 +572,7 @@ static void menuNeedsUpdate (id self, SEL, NSMenu* menu)
         : oldMenu (MenuBarModel::getMacMainMenu())
     {
         if (auto* appleMenu = MenuBarModel::getMacExtraAppleItemsMenu())
-            oldAppleMenu.reset (new PopupMenu (*appleMenu));
+            oldAppleMenu = std::make_unique<PopupMenu> (*appleMenu);
 
         if (auto* handler = JuceMainMenuHandler::instance)
             oldRecentItems = handler->recentItemsMenuName;