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

mac: Handle the case when closing all menu runners

Browse source
This commit is contained in:
Cheng Zhao 2017-12-21 15:57:27 +09:00
parent 088042841d
commit 7a8864063b
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
atom/browser/api/atom_api_menu_mac.mm
View file

@ -108,7 +108,12 @@ void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
} }
void MenuMac::ClosePopupAt(int32_t window_id) { void MenuMac::ClosePopupAt(int32_t window_id) {
popup_controllers_.erase(window_id); auto it = popup_controllers_.find(window_id);
if (it != popup_controllers_.end()) {
popup_controllers_.erase(it);
} else if (window_id == -1) {
popup_controllers_.clear();
}
} }
// static // static