From 42c2cf95bcaab8abfc5fbecbe4365d3adfe36d5b Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 7 Aug 2018 14:19:16 -0400 Subject: [PATCH] fixup: catch exception when loading extension --- lib/browser/chrome-extension.js | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/lib/browser/chrome-extension.js b/lib/browser/chrome-extension.js index efb99b8c97..696cf4ee44 100644 --- a/lib/browser/chrome-extension.js +++ b/lib/browser/chrome-extension.js @@ -359,15 +359,22 @@ app.on('will-quit', function () { app.once('ready', function () { // The public API to add/remove extensions. BrowserWindow.addExtension = function (srcDirectory) { - const manifest = getManifestFromPath(srcDirectory) - if (manifest) { - loadExtension(manifest) - for (const webContents of getAllWebContents()) { - if (isWindowOrWebView(webContents)) { - loadDevToolsExtensions(webContents, [manifest]) + try { + const manifest = getManifestFromPath(srcDirectory) + if (manifest) { + loadExtension(manifest) + for (const webContents of getAllWebContents()) { + if (isWindowOrWebView(webContents)) { + loadDevToolsExtensions(webContents, [manifest]) + } } + return manifest.name + } + } catch (error) { + if (process.env.ELECTRON_ENABLE_LOGGING) { + console.error('Failed to load browser extension from directory:', srcDirectory) + console.error(error) } - return manifest.name } }