Make Tray icons more robust on Linux (#748)

1 files changed, 35 insertions, 8 deletions

diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index 0afb6289b..c6d9db004 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -22,6 +22,8 @@ export default class TrayIcon {
 
   trayMenu = null;
 
+  visible = false;
+
   trayMenuTemplate = [
     {
       label: 'Show Ferdi',
@@ -50,7 +52,19 @@ export default class TrayIcon {
     },
   ];
 
+  constructor() {
+    ipcMain.on('initialAppSettings', (event, appSettings) => {
+      this._updateTrayMenu(appSettings);
+    });
+
+    ipcMain.on('updateAppSettings', (event, appSettings) => {
+      this._updateTrayMenu(appSettings);
+    });
+  }
+
   _updateTrayMenu(appSettings) {
+    if (!this.trayIcon) return;
+
     if (appSettings.type === 'app') {
       const { isAppMuted } = appSettings.data;
       this.trayMenuTemplate[1].label = isAppMuted ? 'Enable Notifications && Audio' : 'Disable Notifications && Audio';
@@ -62,6 +76,11 @@ export default class TrayIcon {
   }
 
   show() {
+    this.visible = true;
+    this._show();
+  }
+
+  _show() {
     if (this.trayIcon) return;
 
     this.trayIcon = new Tray(this._getAsset('tray', INDICATOR_TRAY_PLAIN));
@@ -73,14 +92,6 @@ export default class TrayIcon {
       this.trayIcon.setContextMenu(this.trayMenu);
     }
 
-    ipcMain.on('initialAppSettings', (event, appSettings) => {
-      this._updateTrayMenu(appSettings);
-    });
-
-    ipcMain.on('updateAppSettings', (event, appSettings) => {
-      this._updateTrayMenu(appSettings);
-    });
-
     this.trayIcon.on('click', () => {
       if (app.mainWindow.isMinimized()) {
         app.mainWindow.restore();
@@ -106,6 +117,11 @@ export default class TrayIcon {
   }
 
   hide() {
+    this.visible = false;
+    this._hide();
+  }
+
+  _hide() {
     if (!this.trayIcon) return;
 
     this.trayIcon.destroy();
@@ -117,6 +133,17 @@ export default class TrayIcon {
     }
   }
 
+  recreateIfVisible() {
+    if (this.visible) {
+      this._hide();
+      setTimeout(() => {
+        if (this.visible) {
+          this._show();
+        }
+      }, 100);
+    }
+  }
+
   setIndicator(indicator) {
     this.indicator = indicator;
     this._refreshIcon();