From 9418d8103beceeb754bd5c8c81b02e15fbf1ae70 Mon Sep 17 00:00:00 2001 From: Kiran Niranjan Date: Fri, 29 Mar 2019 09:55:54 +0530 Subject: [PATCH] ELECTRON-1100 - Add safety check for toggle developer tools (#622) --- js/menus/menuTemplate.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/js/menus/menuTemplate.js b/js/menus/menuTemplate.js index 856170fb..97a6d9fc 100644 --- a/js/menus/menuTemplate.js +++ b/js/menus/menuTemplate.js @@ -196,16 +196,18 @@ function getTemplate(app) { accelerator: isMac ? 'Alt+Command+I' : 'Ctrl+Shift+I', click(item, focusedWindow) { let devToolsEnabled = readConfigFromFile('devToolsEnabled'); - if (focusedWindow && devToolsEnabled) { - focusedWindow.webContents.toggleDevTools(); - } else { - log.send(logLevels.INFO, `dev tools disabled for ${focusedWindow.winName} window`); - electron.dialog.showMessageBox(focusedWindow, { - type: 'warning', - buttons: ['Ok'], - title: i18n.getMessageFor('Dev Tools disabled'), - message: i18n.getMessageFor('Dev Tools has been disabled! Please contact your system administrator to enable it!'), - }); + if (focusedWindow && !focusedWindow.isDestroyed()) { + if (devToolsEnabled) { + focusedWindow.webContents.toggleDevTools(); + } else { + log.send(logLevels.INFO, `dev tools disabled for ${focusedWindow.winName} window`); + electron.dialog.showMessageBox(focusedWindow, { + type: 'warning', + buttons: ['Ok'], + title: i18n.getMessageFor('Dev Tools disabled'), + message: i18n.getMessageFor('Dev Tools has been disabled! Please contact your system administrator to enable it!'), + }); + } } } },