mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #3968 from leethomas/fix-window-submenu-crashes

Browse source 
🍎 only add sub menus to Window when they actually have menu ite…
This commit is contained in:
Cheng Zhao 2015-12-31 18:51:45 +08:00
commit be2f900d93
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/ui/cocoa/atom_menu_controller.mm
View file

@ -148,10 +148,11 @@ Role kRolesMap[] = {
// Set submenu's role.
base::string16 role = model->GetRoleAt(index);
if (role == base::ASCIIToUTF16("window"))
if (role == base::ASCIIToUTF16("window") && [submenu numberOfItems])
[NSApp setWindowsMenu:submenu];
else if (role == base::ASCIIToUTF16("help"))
[NSApp setHelpMenu:submenu];
if (role == base::ASCIIToUTF16("services"))
[NSApp setServicesMenu:submenu];
} else {