Merge pull request #47 from brave/issue_45_dev_tools_shortcuts

don't crash on tab or window close when no windows are active
brave · Dec 12, 2015 · 87c7b5a · 87c7b5a
2 parents 5a63762 + d7a11fe
commit 87c7b5a
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/app/menu.js b/app/menu.js
@@ -30,14 +30,24 @@ const init = () => {
         }, {
           type: 'separator'
         }, {
+          // this should be disabled when
+          // no windows are active
           label: 'Close Window',
           accelerator: 'CmdOrCtrl+Shift+W',
-          click: () => process.emit('close-window')
+          click: function (item, focusedWindow) {
+            if (focusedWindow) {
+              process.emit('close-window')
+            }
+          }
         }, {
+          // this should be disabled when
+          // no windows are active
           label: 'Close Tab',
           accelerator: 'CmdOrCtrl+W',
           click: function (item, focusedWindow) {
-            focusedWindow.webContents.send('shortcut-close-frame')
+            if (focusedWindow) {
+              focusedWindow.webContents.send('shortcut-close-frame')
+            }
           }
         }
       ]