4 files changed, 54 insertions, 53 deletions

diff --git a/package.json b/package.json
index 2e6ad1888..c9651fcb8 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "chalk": "5.2.0",
     "concurrently": "7.6.0",
     "cross-env": "7.0.3",
-    "electron": "24.1.2",
+    "electron": "24.1.3",
     "electron-builder": "23.6.0",
     "esbuild": "0.16.17",
     "esbuild-plugin-copy": "2.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 165308d01..393022fa6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -56,7 +56,7 @@ specifiers:
   darkreader: 4.9.58
   dbus-next: 0.10.2
   debug: 4.3.4
-  electron: 24.1.2
+  electron: 24.1.3
   electron-builder: 23.6.0
   electron-dl: 3.5.0
   electron-find: 1.0.7
@@ -154,8 +154,8 @@ dependencies:
   '@adonisjs/session': 1.1.0
   '@adonisjs/shield': 1.1.0
   '@adonisjs/validator': 5.1.0
-  '@electron/remote': 2.0.9_electron@24.1.2
-  '@krisdages/electron-process-manager': 3.0.0_pkzcdmovnays3mesrjdzf6nn2m
+  '@electron/remote': 2.0.9_electron@24.1.3
+  '@krisdages/electron-process-manager': 3.0.0_jpyffg2nrr5dnosjhkzj3qokde
   '@mdi/js': 6.9.96
   '@mdi/react': 1.6.1
   '@octokit/core': 4.2.0
@@ -254,7 +254,7 @@ devDependencies:
   chalk: 5.2.0
   concurrently: 7.6.0
   cross-env: 7.0.3
-  electron: 24.1.2
+  electron: 24.1.3
   electron-builder: 23.6.0
   esbuild: 0.16.17
   esbuild-plugin-copy: 2.1.0_esbuild@0.16.17
@@ -1092,12 +1092,12 @@ packages:
       - supports-color
     dev: true
 
-  /@electron/remote/2.0.9_electron@24.1.2:
+  /@electron/remote/2.0.9_electron@24.1.3:
     resolution: {integrity: sha512-LR0W0ID6WAKHaSs0x5LX9aiG+5pFBNAJL6eQAJfGkCuZPUa6nZz+czZLdlTDETG45CgF/0raSvCtYOYUpr6c+A==}
     peerDependencies:
       electron: '>= 13.0.0'
     dependencies:
-      electron: 24.1.2
+      electron: 24.1.3
     dev: false
 
   /@electron/universal/1.2.1:
@@ -1529,7 +1529,7 @@ packages:
       chalk: 4.1.2
       ci-info: 3.7.0
       exit: 0.1.2
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jest-changed-files: 28.1.3
       jest-config: 28.1.3_@types+node@16.11.33
       jest-haste-map: 28.1.3
@@ -1559,7 +1559,7 @@ packages:
     dependencies:
       '@jest/fake-timers': 28.1.3
       '@jest/types': 28.1.3
-      '@types/node': 18.15.11
+      '@types/node': 16.11.33
       jest-mock: 28.1.3
     dev: true
 
@@ -1593,7 +1593,7 @@ packages:
     dependencies:
       '@jest/types': 28.1.3
       '@sinonjs/fake-timers': 9.1.2
-      '@types/node': 18.15.11
+      '@types/node': 16.11.33
       jest-message-util: 28.1.3
       jest-mock: 28.1.3
       jest-util: 28.1.3
@@ -1783,15 +1783,15 @@ packages:
       '@jridgewell/sourcemap-codec': 1.4.14
     dev: true
 
-  /@krisdages/electron-process-manager/3.0.0_pkzcdmovnays3mesrjdzf6nn2m:
+  /@krisdages/electron-process-manager/3.0.0_jpyffg2nrr5dnosjhkzj3qokde:
     resolution: {integrity: sha512-Gs8McOVC6BVdfP4SeF+l5nx85eFooarm37K5mxs1PESI59a7oLwRf5Yd2tsZ6Ye14bCG0eTJGDv3yPuixBg3OQ==}
     peerDependencies:
       '@electron/remote': '>= 1.2.0'
       electron: '>= 10'
       rxjs: '>= 7'
     dependencies:
-      '@electron/remote': 2.0.9_electron@24.1.2
-      electron: 24.1.2
+      '@electron/remote': 2.0.9_electron@24.1.3
+      electron: 24.1.3
       electron-process-reporter: /@krisdages/electron-process-reporter/2.0.0-rxjs7-1.4.0
     dev: false
 
@@ -2230,14 +2230,14 @@ packages:
     requiresBuild: true
     dependencies:
       '@types/minimatch': 5.1.2
-      '@types/node': 18.15.11
+      '@types/node': 16.11.33
     dev: true
     optional: true
 
   /@types/graceful-fs/4.1.5:
     resolution: {integrity: sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==}
     dependencies:
-      '@types/node': 18.15.11
+      '@types/node': 16.11.33
     dev: true
 
   /@types/hoist-non-react-statics/3.3.1:
@@ -2327,7 +2327,7 @@ packages:
     resolution: {integrity: sha512-ULqvZNGMv0zRFvqn8/4LSPtnmN4MfhlPNtJCTpKuIIxGVGZ2rYWzFXrvEBoh9CVyqSE7D6YFRJ1hydLHI6kbWw==}
     requiresBuild: true
     dependencies:
-      '@types/node': 18.15.11
+      '@types/node': 16.11.33
       xmlbuilder: 15.1.1
     dev: true
     optional: true
@@ -4787,8 +4787,8 @@ packages:
       mkdirp: 0.5.6
     dev: false
 
-  /electron/24.1.2:
-    resolution: {integrity: sha512-V0isWbyLYiXrSCcB4lrSVhS/U56NFGfuqHyc+yEPkyhhvY+h4F85cYGdEiZlXp6XjHT+/CLHmw0ltK54g9lvDw==}
+  /electron/24.1.3:
+    resolution: {integrity: sha512-lHFRf2CgeOxPLje4BayzaLz1e/SbNejUU4NDarFjBlcYfuH4ceGevYRVjyDZJLbSGdhmM2dLraeku30LGEigCg==}
     engines: {node: '>= 12.20.55'}
     hasBin: true
     requiresBuild: true
@@ -6237,10 +6237,6 @@ packages:
       p-cancelable: 2.1.1
       responselike: 2.0.1
 
-  /graceful-fs/4.2.10:
-    resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
-    dev: true
-
   /graceful-fs/4.2.11:
     resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
 
@@ -7127,7 +7123,7 @@ packages:
       '@jest/expect': 28.1.3
       '@jest/test-result': 28.1.3
       '@jest/types': 28.1.3
-      '@types/node': 18.15.11
+      '@types/node': 16.11.33
       chalk: 4.1.2
       co: 4.6.0
       dedent: 0.7.0
@@ -7161,7 +7157,7 @@ packages:
       '@jest/types': 28.1.3
       chalk: 4.1.2
       exit: 0.1.2
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       import-local: 3.1.0
       jest-config: 28.1.3_@types+node@16.11.33
       jest-util: 28.1.3
@@ -7258,7 +7254,7 @@ packages:
       '@jest/environment': 28.1.3
       '@jest/fake-timers': 28.1.3
       '@jest/types': 28.1.3
-      '@types/node': 18.15.11
+      '@types/node': 16.11.33
       jest-mock: 28.1.3
       jest-util: 28.1.3
     dev: true
@@ -7355,7 +7351,7 @@ packages:
     engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
     dependencies:
       '@jest/types': 28.1.3
-      '@types/node': 18.15.11
+      '@types/node': 16.11.33
     dev: true
 
   /jest-pnp-resolver/1.2.3_jest-resolve@28.1.3:
@@ -7544,7 +7540,7 @@ packages:
     resolution: {integrity: sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==}
     engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
     dependencies:
-      '@types/node': 18.15.11
+      '@types/node': 16.11.33
       merge-stream: 2.0.0
       supports-color: 8.1.1
     dev: true
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 {