Update electron

2 files changed, 31 insertions, 26 deletions

diff --git a/src/lib/Menu.ts b/src/lib/Menu.ts
index 5356ec2c6..b1510cec3 100644
--- a/src/lib/Menu.ts
+++ b/src/lib/Menu.ts
@@ -736,15 +736,18 @@ class FranzMenu implements StoresProps {
         {
           label: intl.formatMessage(menuItems.toggleDevTools),
           accelerator: `${cmdOrCtrlShortcutKey()}+${altKey()}+I`,
+          enabled: webContents.fromId(1) !== undefined,
           click: () => {
             const windowWebContents = webContents.fromId(1);
-            const { isDevToolsOpened, openDevTools, closeDevTools } =
-              windowWebContents;
+            if (windowWebContents) {
+              const { isDevToolsOpened, openDevTools, closeDevTools } =
+                windowWebContents;
 
-            if (isDevToolsOpened()) {
-              closeDevTools();
-            } else {
-              openDevTools({ mode: 'right' });
+              if (isDevToolsOpened()) {
+                closeDevTools();
+              } else {
+                openDevTools({ mode: 'right' });
+              }
             }
           },
         },
diff --git a/src/models/Service.ts b/src/models/Service.ts
index 493620ba4..0cbfa60e2 100644
--- a/src/models/Service.ts
+++ b/src/models/Service.ts
@@ -527,27 +527,29 @@ export default class Service {
       this._didMediaPaused();
     });
 
-    webviewWebContents.on('login', (event, _, authInfo, callback) => {
-      // const authCallback = callback;
-      debug('browser login event', authInfo);
-      event.preventDefault();
-
-      if (authInfo.isProxy && authInfo.scheme === 'basic') {
-        debug('Sending service echo ping');
-        webviewWebContents.send('get-service-id');
-
-        debug('Received service id', this.id);
-
-        const ps = stores.settings.proxy[this.id];
-
-        if (ps) {
-          debug('Sending proxy auth callback for service', this.id);
-          callback(ps.user, ps.password);
-        } else {
-          debug('No proxy auth config found for', this.id);
+    if (webviewWebContents) {
+      webviewWebContents.on('login', (event, _, authInfo, callback) => {
+        // const authCallback = callback;
+        debug('browser login event', authInfo);
+        event.preventDefault();
+
+        if (authInfo.isProxy && authInfo.scheme === 'basic') {
+          debug('Sending service echo ping');
+          webviewWebContents.send('get-service-id');
+
+          debug('Received service id', this.id);
+
+          const ps = stores.settings.proxy[this.id];
+
+          if (ps) {
+            debug('Sending proxy auth callback for service', this.id);
+            callback(ps.user, ps.password);
+          } else {
+            debug('No proxy auth config found for', this.id);
+          }
         }
-      }
-    });
+      });
+    }
   }
 
   initializeWebViewListener(): void {