mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: don't crash on tray.setContextMenu(null) (#14331)

Browse source
This commit is contained in:
trop[bot] 2018-08-27 13:27:41 -07:00 • committed by Shelley Vohr
parent 97058837e7
commit c8a21dbb92
4 changed files with 38 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
atom/browser/ui/tray_icon_cocoa.mm
View file

@ -474,11 +474,18 @@ void TrayIconCocoa::SetContextMenu(AtomMenuModel* menu_model) {
// Substribe to MenuClosed event.
if (menu_model_)
menu_model_->RemoveObserver(this);
menu_model->AddObserver(this);
// Create native menu.
menu_.reset([[AtomMenuController alloc] initWithModel:menu_model
useDefaultAccelerator:NO]);
menu_model_ = menu_model;
if (menu_model) {
menu_model->AddObserver(this);
// Create native menu.
menu_.reset([[AtomMenuController alloc] initWithModel:menu_model
useDefaultAccelerator:NO]);
} else {
menu_.reset();
}
[status_item_view_ setMenuController:menu_.get()];
}