Merge pull request RocketChat#324 from RocketChat/fix/318-reoccurring…

…-error-popup Prevent error from tray when window reloads
HappyTobi · Jan 26, 2017 · f21644d · f21644d
2 parents 3a730a5 + 257e342
commit f21644d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/src/scripts/menus.js b/src/scripts/menus.js
@@ -139,8 +139,8 @@ if (process.platform === 'darwin') {
                     accelerator: 'Command+Shift+R',
                     click: function () {
                         var mainWindow = remote.getCurrentWindow();
-                        if (mainWindow.tray) {
-                            mainWindow.tray.destroy();
+                        if (mainWindow.destroyTray) {
+                            mainWindow.destroyTray();
                         }
                         mainWindow.reload();
                     }
@@ -354,8 +354,8 @@ if (process.platform === 'darwin') {
                     accelerator: 'Ctrl+Shift+R',
                     click: function () {
                         var mainWindow = remote.getCurrentWindow();
-                        if (mainWindow.tray) {
-                            mainWindow.tray.destroy();
+                        if (mainWindow.destroyTray) {
+                            mainWindow.destroyTray();
                         }
                         mainWindow.reload();
                     }

diff --git a/src/scripts/tray.js b/src/scripts/tray.js
@@ -57,13 +57,16 @@ function createAppTray () {
         _tray.setContextMenu(contextMenuHide);
     }
 
-    mainWindow.on('show', () => {
+    const onShow = function () {
         _tray.setContextMenu(contextMenuHide);
-    });
+    };
 
-    mainWindow.on('hide', () => {
+    const onHide = function () {
         _tray.setContextMenu(contextMenuShow);
-    });
+    };
+
+    mainWindow.on('show', onShow);
+    mainWindow.on('hide', onHide);
 
     _tray.setToolTip(remote.app.getName());
 
@@ -75,7 +78,11 @@ function createAppTray () {
         mainWindow.show();
     });
 
-    mainWindow.tray = _tray;
+    mainWindow.destroyTray = function () {
+        mainWindow.removeListener('show', onShow);
+        mainWindow.removeListener('hide', onHide);
+        _tray.destroy();
+    };
 }
 
 function showTrayAlert (showAlert, title) {