From 7a8864063b0f15790e1835da0515ca22751d6796 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Thu, 21 Dec 2017 15:57:27 +0900
Subject: [PATCH] mac: Handle the case when closing all menu runners

---
 atom/browser/api/atom_api_menu_mac.mm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/atom/browser/api/atom_api_menu_mac.mm b/atom/browser/api/atom_api_menu_mac.mm
index e9ed004938cd..2b5c337f518c 100644
--- a/atom/browser/api/atom_api_menu_mac.mm
+++ b/atom/browser/api/atom_api_menu_mac.mm
@@ -108,7 +108,12 @@ void MenuMac::PopupOnUI(const base::WeakPtr<NativeWindow>& native_window,
 }
 
 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