github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Memory safety

Browse Source
This commit is contained in:
Zhuo Lu
2018-05-08 14:59:08 -07:00
parent 79caff69f5
commit dd89aa6c77
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
atom/browser/api/atom_api_menu_mac.mm
View File

@@ -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