fix: close context menu before popup (#17509)

electron · Mar 22, 2019 · ef38019 · ef38019
1 parent e280ae1
commit ef38019
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/atom/browser/ui/win/notify_icon.cc b/atom/browser/ui/win/notify_icon.cc
@@ -142,6 +142,10 @@ void NotifyIcon::PopUpContextMenu(const gfx::Point& pos,
   if (!SetForegroundWindow(window_))
     return;
 
+  // Cancel current menu if there is one.
+  if (menu_runner_ && menu_runner_->IsRunning())
+    menu_runner_->Cancel();
+
   // Show menu at mouse's position by default.
   gfx::Rect rect(pos, gfx::Size());
   if (pos.IsOrigin())

diff --git a/spec/api-tray-spec.js b/spec/api-tray-spec.js
@@ -23,6 +23,23 @@ describe('tray module', () => {
     })
   })
 
+  describe('tray.popUpContextMenu', () => {
+    before(function () {
+      if (process.platform !== 'win32') {
+        this.skip()
+      }
+    })
+
+    it('can be called when menu is showing', (done) => {
+      tray.setContextMenu(Menu.buildFromTemplate([{ label: 'Test' }]))
+      setTimeout(() => {
+        tray.popUpContextMenu()
+        done()
+      })
+      tray.popUpContextMenu()
+    })
+  })
+
   describe('tray.setImage', () => {
     it('accepts empty image', () => {
       tray.setImage(nativeImage.createEmpty())