Merge branch 'develop' into uiscripting

steinbergmedia · Oct 6, 2023 · c75d635 · c75d635
2 parents bad8f1a + 919bef4
commit c75d635
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/vstgui/standalone/source/platform/mac/macapplication.mm b/vstgui/standalone/source/platform/mac/macapplication.mm
@@ -308,13 +308,15 @@ - (void)setupMainMenu
 {
 	NSMenu* mainMenu = [NSApp mainMenu];
 	NSMenuItem* appMenuItem = nil;
-	if (mainMenu == nil)
+	if (mainMenu == nil || mainMenu.itemArray.count == 1)
 	{
-		mainMenu = [NSMenu new];
-		[NSApp setMainMenu:mainMenu];
-
-		appMenuItem = [[NSMenuItem alloc] initWithTitle:@"App" action:nil keyEquivalent:@""];
-		[mainMenu addItem:appMenuItem];
+		if (mainMenu == nil)
+		{
+			mainMenu = [NSMenu new];
+			[NSApp setMainMenu:mainMenu];
+			appMenuItem = [[NSMenuItem alloc] initWithTitle:@"App" action:nil keyEquivalent:@""];
+			[mainMenu addItem:appMenuItem];
+		}
 
 		NSMenuItem* item =
 		    [[NSMenuItem alloc] initWithTitle:NSLocalizedString (@"Window", "Menu Name")
@@ -423,14 +425,17 @@ - (void)setupMainMenu
 	}
 
 	// move Windows menu to the end
-	NSMenuItem* windowsMenuItem =
-	    [mainMenu itemWithTitle:NSLocalizedString (@"Window", "Menu Name")];
-	[mainMenu removeItem:windowsMenuItem];
-	[mainMenu addItem:windowsMenuItem];
+	if (auto* windowsMenuItem = [mainMenu itemWithTitle:NSLocalizedString (@"Window", "Menu Name")])
+	{
+		[mainMenu removeItem:windowsMenuItem];
+		[mainMenu addItem:windowsMenuItem];
+	}
 	// move Help menu to the end
-	NSMenuItem* helpMenuItem = [mainMenu itemWithTitle:NSLocalizedString (@"Help", "Menu Name")];
-	[mainMenu removeItem:helpMenuItem];
-	[mainMenu addItem:helpMenuItem];
+	if (auto* helpMenuItem = [mainMenu itemWithTitle:NSLocalizedString (@"Help", "Menu Name")])
+	{
+		[mainMenu removeItem:helpMenuItem];
+		[mainMenu addItem:helpMenuItem];
+	}
 }
 
 //------------------------------------------------------------------------