Browse Source

macOS: Prevent mac menu bar submenus with empty names being used as the recent items menu

tags/2021-05-28
ed 6 years ago
parent
commit
b0934f896c
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      modules/juce_gui_basics/native/juce_mac_MainMenu.mm

+ 3
- 3
modules/juce_gui_basics/native/juce_mac_MainMenu.mm View File

@@ -249,10 +249,10 @@ public:
}
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 @@ public:
: 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;


Loading…
Cancel
Save