From af728427282ecd1673df658e817553737106520e Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Sun, 16 Nov 2014 21:06:16 +0800 Subject: [PATCH] cocoa: Enable creating empty menu --- atom/browser/ui/cocoa/atom_menu_controller.mm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/atom/browser/ui/cocoa/atom_menu_controller.mm b/atom/browser/ui/cocoa/atom_menu_controller.mm index 5013f5a9ee8a..69a7b56826d7 100644 --- a/atom/browser/ui/cocoa/atom_menu_controller.mm +++ b/atom/browser/ui/cocoa/atom_menu_controller.mm @@ -251,10 +251,13 @@ int EventFlagsFromNSEvent(NSEvent* event) { } - (NSMenu*)menu { - if (!menu_ && model_) { - menu_.reset([[self menuFromModel:model_] retain]); - [menu_ setDelegate:self]; - } + if (menu_) + return menu_.get(); + + menu_.reset([[NSMenu alloc] initWithTitle:@""]); + [menu_ setDelegate:self]; + if (model_) + [self populateWithModel:model_]; return menu_.get(); }