From 04158b15bbb16c9a5e943f3dc10bad71b7dafa17 Mon Sep 17 00:00:00 2001 From: "trop[bot]" Date: Sat, 9 Feb 2019 09:58:25 -0800 Subject: [PATCH] fix: enable property having no effect on submenus (#16858) --- atom/browser/ui/cocoa/atom_menu_controller.mm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/atom/browser/ui/cocoa/atom_menu_controller.mm b/atom/browser/ui/cocoa/atom_menu_controller.mm index 695807135ebd7..e28504a26a60c 100644 --- 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];