From eac2f6fec3272dbc5fcd6724c59fb77b14fb29c9 Mon Sep 17 00:00:00 2001 From: leethomas Date: Wed, 30 Dec 2015 19:36:02 -0800 Subject: [PATCH] :apple: only add sub menus to Window when they actually have menu items. fixes #3873 --- atom/browser/ui/cocoa/atom_menu_controller.mm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/atom/browser/ui/cocoa/atom_menu_controller.mm b/atom/browser/ui/cocoa/atom_menu_controller.mm index e3aa78aa248c..9c8c99da9aa6 100644 --- a/atom/browser/ui/cocoa/atom_menu_controller.mm +++ b/atom/browser/ui/cocoa/atom_menu_controller.mm @@ -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 {