From ca1e6c3ccd3a6c6ff4faa7a1cf77095b4c0a1e37 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Mon, 10 Jun 2019 14:41:05 -0700
Subject: [PATCH] To prevent crashes, catch thrown error from tray.setIcon

---
 app/tray_icon.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/tray_icon.js b/app/tray_icon.js
index 2f7801d7bb..77ca7b1d3a 100644
--- a/app/tray_icon.js
+++ b/app/tray_icon.js
@@ -95,7 +95,14 @@ function createTrayIcon(getMainWindow, messages) {
       console.log('tray.updateIcon: Image for tray update does not exist!');
       return;
     }
-    tray.setImage(image);
+    try {
+      tray.setImage(image);
+    } catch (error) {
+      console.log(
+        'tray.setImage error:',
+        error && error.stack ? error.stack : error
+      );
+    }
   };
 
   tray.on('click', tray.showWindow);