From 9e856e19a09937d1ed089f924a72e9af775afa24 Mon Sep 17 00:00:00 2001
From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
Date: Thu, 30 Sep 2021 17:29:06 -0500
Subject: [PATCH] Defend against destroyed window when updating zoom factor

---
 main.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/main.js b/main.js
index fbf54fdb4c6..6d148602cc6 100644
--- a/main.js
+++ b/main.js
@@ -320,14 +320,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;
   };