Unregister per-window hotkeys when window is closed.

Without this, the sequence +n, +W, +W crashes because a handler is called with the deleted window. I don't think this can be effectively tested.
mozilla · May 25, 2016 · b94c5b1 · b94c5b1
1 parent 57dec82
commit b94c5b1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/app/main/browser.js b/app/main/browser.js
@@ -98,6 +98,9 @@ async function makeBrowserWindow(): Promise<electron.BrowserWindow> {
   browser.loadURL(fileUrl(path.join(UI_DIR, 'browser', 'browser.html')));
 
   hotkeys.bindBrowserWindowHotkeys(browser);
+  browser.once('closed', () => {
+    hotkeys.unbindBrowserWindowHotkeys(browser);
+  });
 
   return browser;
 }

diff --git a/app/main/hotkeys.js b/app/main/hotkeys.js
@@ -43,6 +43,10 @@ export function bindBrowserWindowHotkeys(browserWindow) {
   });
 }
 
+export function unbindBrowserWindowHotkeys(browserWindow) {
+  shortcut.unregisterAll(browserWindow);
+}
+
 /**
  * To be used in responding to IPC 'synthesize-accelerator' messages, by looking
  * through hotkeys defined and firing the message to the active browser window if found.