Merge branch 'develop' into patch-1

2 files changed, 3 insertions, 8 deletions

diff --git a/src/index.js b/src/index.js
index 9ca059f48..030736fee 100644
--- a/src/index.js
+++ b/src/index.js
@@ -66,7 +66,7 @@ const createWindow = async () => {
   });
 
   // Initialize System Tray
-  const trayIcon = new Tray(mainWindow);
+  const trayIcon = new Tray();
 
   // Initialize ipcApi
   ipcApi({ mainWindow, settings, trayIcon });
diff --git a/src/lib/Tray.js b/src/lib/Tray.js
index 67150971e..525ce592e 100644
--- a/src/lib/Tray.js
+++ b/src/lib/Tray.js
@@ -6,13 +6,8 @@ const INDICATOR_TRAY_PLAIN = 'tray';
 const INDICATOR_TRAY_UNREAD = 'tray-unread';
 
 export default class TrayIcon {
-  mainWindow = null;
   trayIcon = null;
 
-  constructor(mainWindow) {
-    this.mainWindow = mainWindow;
-  }
-
   show() {
     if (this.trayIcon) return;
 
@@ -21,7 +16,7 @@ export default class TrayIcon {
       {
         label: 'Show Franz',
         click() {
-          this.mainWindow.show();
+          app.mainWindow.show();
         },
       }, {
         label: 'Quit Franz',
@@ -35,7 +30,7 @@ export default class TrayIcon {
     this.trayIcon.setContextMenu(trayMenu);
 
     this.trayIcon.on('click', () => {
-      this.mainWindow.show();
+      app.mainWindow.show();
     });
   }