github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't construct submenu if it's invisible (#16845)

Browse Source
This commit is contained in:
trop[bot]
2019-02-08 15:13:07 -08:00
committed by Shelley Vohr
parent 93b4d20c59
commit b4c27eeaa1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,7 +242,8 @@ static base::scoped_nsobject<NSMenu> recentDocumentsMenuSwap_;
NSMenu* submenu = [[NSMenu alloc] initWithTitle:label];
[item setSubmenu:submenu];
[NSApp setServicesMenu:submenu];
} else if (type == atom::AtomMenuModel::TYPE_SUBMENU) {
} else if (type == atom::AtomMenuModel::TYPE_SUBMENU &&
model->IsVisibleAt(index)) {
// Recursively build a submenu from the sub-model at this index.
[item setTarget:nil];
[item setAction:nil];