Browse Source

Memory safety

Zhuo Lu 7 years ago
parent
commit
dd89aa6c77
1 changed files with 2 additions and 2 deletions
  1. 2 2
      atom/browser/api/atom_api_menu_mac.mm

+ 2 - 2
atom/browser/api/atom_api_menu_mac.mm

@@ -20,7 +20,7 @@ using content::BrowserThread;
 
 namespace {
 
-static NSMenu* applicationMenu_ = nil;
+static scoped_nsobject<NSMenu> applicationMenu_;
 
 }  // namespace
 
@@ -146,7 +146,7 @@ void Menu::SetApplicationMenu(Menu* base_menu) {
   [currentRunLoop cancelPerformSelector:@selector(setMainMenu:)
                                  target:NSApp
                                argument:applicationMenu_];
-  applicationMenu_ = [menu_controller menu];
+  applicationMenu_.reset([[menu_controller menu] retain]);
   [[NSRunLoop currentRunLoop]
       performSelector:@selector(setMainMenu:)
                target:NSApp