Defend against destroyed window when updating zoom factor

Co-authored-by: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
signalapp · Oct 4, 2021 · 2bffa9a · 2bffa9a
1 parent e47c120
commit 2bffa9a
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/main.js b/main.js
@@ -315,14 +315,20 @@ function handleCommonWindowEvents(window) {
   // Works only for mainWindow because it has `enablePreferredSizeMode`
   let lastZoomFactor = window.webContents.getZoomFactor();
   const onZoomChanged = () => {
+    if (
+      window.isDestroyed() ||
+      !window.webContents ||
+      window.webContents.isDestroyed()
+    ) {
+      return;
+    }
+
     const zoomFactor = window.webContents.getZoomFactor();
     if (lastZoomFactor === zoomFactor) {
       return;
     }
 
-    if (window.webContents) {
-      window.webContents.send('callbacks:call:persistZoomFactor', [zoomFactor]);
-    }
+    window.webContents.send('callbacks:call:persistZoomFactor', [zoomFactor]);
 
     lastZoomFactor = zoomFactor;
   };