fix: enable property having no effect on submenus (#16835)

electron · Feb 9, 2019 · 1898f91 · 1898f91
1 parent d16b581
commit 1898f91
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/atom/browser/ui/cocoa/atom_menu_controller.mm b/atom/browser/ui/cocoa/atom_menu_controller.mm
@@ -246,6 +246,11 @@ - (void)addItemToMenu:(NSMenu*)menu
     [NSApp setServicesMenu:submenu];
   } else if (type == atom::AtomMenuModel::TYPE_SUBMENU &&
              model->IsVisibleAt(index)) {
+    // We need to specifically check that the submenu top-level item has been
+    // enabled as it's not validated by validateUserInterfaceItem
+    if (!model->IsEnabledAt(index))
+      [item setEnabled:NO];
+
     // Recursively build a submenu from the sub-model at this index.
     [item setTarget:nil];
     [item setAction:nil];