From c95d6f3d7ad5cf7f46a6fba11f6e57a2b46bc452 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Mon, 6 Nov 2017 14:04:57 +0100
Subject: add debugging output for mainWindow

---
 src/index.js | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/index.js b/src/index.js
index a3aa14732..4507913ad 100644
--- a/src/index.js
+++ b/src/index.js
@@ -26,19 +26,22 @@ if (isWindows) {
 }
 
 // Force single window
-if (process.platform !== 'darwin') {
-  const isSecondInstance = app.makeSingleInstance(() => {
-    if (mainWindow) {
-      if (mainWindow.isMinimized()) mainWindow.restore();
-      mainWindow.focus();
-    }
-  });
-
-  if (isSecondInstance) {
-    app.quit();
+// if (process.platform !== 'darwin') {
+const isSecondInstance = app.makeSingleInstance(() => {
+  console.log(mainWindow);
+  console.log('isMinimized', mainWindow.isMinimized);
+  if (mainWindow) {
+    if (mainWindow.isMinimized()) mainWindow.restore();
+    mainWindow.focus();
   }
+});
+
+if (isSecondInstance) {
+  app.exit();
 }
 
+// }
+
 // Initialize Settings
 const settings = new Settings();
 
@@ -112,7 +115,7 @@ const createWindow = async () => {
   });
 
   mainWindow.on('close', (e) => {
-    if (settings.get('minimizeToSystemTray')) {
+    if (settings.get('minimizeToSystemTray') && settings.get('runInBackground')) {
       e.preventDefault();
       mainWindow.minimize();
     }
-- 
cgit v1.2.3-70-g09d2


From eea593eaab81ec311f86204d60623fe8f68b13ed Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Mon, 6 Nov 2017 14:47:05 +0100
Subject: fix multiple on close handler

---
 src/index.js | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/index.js b/src/index.js
index 4507913ad..3b86f09bc 100644
--- a/src/index.js
+++ b/src/index.js
@@ -26,7 +26,6 @@ if (isWindows) {
 }
 
 // Force single window
-// if (process.platform !== 'darwin') {
 const isSecondInstance = app.makeSingleInstance(() => {
   console.log(mainWindow);
   console.log('isMinimized', mainWindow.isMinimized);
@@ -40,7 +39,6 @@ if (isSecondInstance) {
   app.exit();
 }
 
-// }
 
 // Initialize Settings
 const settings = new Settings();
@@ -89,9 +87,13 @@ const createWindow = async () => {
     // when you should delete the corresponding element.
     if (!willQuitApp && (settings.get('runInBackground') === undefined || settings.get('runInBackground'))) {
       e.preventDefault();
-      mainWindow.hide();
+      if (isWindows) {
+        mainWindow.minimize();
+      } else {
+        mainWindow.hide();
+      }
 
-      if (process.platform === 'win32') {
+      if (isWindows && settings.get('minimizeToSystemTray')) {
         mainWindow.setSkipTaskbar(true);
       }
     } else {
@@ -114,13 +116,6 @@ const createWindow = async () => {
     app.isMaximized = true;
   });
 
-  mainWindow.on('close', (e) => {
-    if (settings.get('minimizeToSystemTray') && settings.get('runInBackground')) {
-      e.preventDefault();
-      mainWindow.minimize();
-    }
-  });
-
   mainWindow.on('unmaximize', () => {
     app.isMaximized = false;
   });
-- 
cgit v1.2.3-70-g09d2


From 9d8742faa465f51d61e0ab8b132ca12e2f53ae26 Mon Sep 17 00:00:00 2001
From: Stefan Malzner <stefan@adlk.io>
Date: Mon, 6 Nov 2017 15:15:33 +0100
Subject: remove debugging

---
 src/index.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/index.js b/src/index.js
index 3b86f09bc..f0fe56ae5 100644
--- a/src/index.js
+++ b/src/index.js
@@ -27,8 +27,6 @@ if (isWindows) {
 
 // Force single window
 const isSecondInstance = app.makeSingleInstance(() => {
-  console.log(mainWindow);
-  console.log('isMinimized', mainWindow.isMinimized);
   if (mainWindow) {
     if (mainWindow.isMinimized()) mainWindow.restore();
     mainWindow.focus();
-- 
cgit v1.2.3-70-g09d2