Merge pull request #228 from meetfranz/developv5.0.0-beta.13

Beta 13 hotfix

3 files changed, 24 insertions, 20 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b5a0755c..024afe93c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+<a name="5.0.0-beta.13"></a>
+# [5.0.0-beta.13](https://github.com/meetfranz/franz/compare/v5.0.0-beta.12...v5.0.0-beta.13) (2017-11-06)
+
+### Bug Fixes
+
+* **Windows:** Fix issue with multiple close handlers that prevent the app from quitting  ([eea593e](https://github.com/meetfranz/franz/commit/eea593e))
+
+
 <a name="5.0.0-beta.12"></a>
 # [5.0.0-beta.12](https://github.com/meetfranz/franz/compare/v5.0.0-beta.11...v5.0.0-beta.12) (2017-11-05)
 
diff --git a/package.json b/package.json
index 057dc6d60..9b56cdf27 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "franz",
   "productName": "Franz",
   "appId": "com.meetfranz.franz",
-  "version": "5.0.0-beta.12",
+  "version": "5.0.0-beta.13",
   "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.",
   "copyright": "adlk x franz - Stefan Malzner",
   "main": "index.js",
diff --git a/src/index.js b/src/index.js
index a3aa14732..f0fe56ae5 100644
--- a/src/index.js
+++ b/src/index.js
@@ -26,19 +26,18 @@ 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();
+const isSecondInstance = app.makeSingleInstance(() => {
+  if (mainWindow) {
+    if (mainWindow.isMinimized()) mainWindow.restore();
+    mainWindow.focus();
   }
+});
+
+if (isSecondInstance) {
+  app.exit();
 }
 
+
 // Initialize Settings
 const settings = new Settings();
 
@@ -86,9 +85,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 {
@@ -111,13 +114,6 @@ const createWindow = async () => {
     app.isMaximized = true;
   });
 
-  mainWindow.on('close', (e) => {
-    if (settings.get('minimizeToSystemTray')) {
-      e.preventDefault();
-      mainWindow.minimize();
-    }
-  });
-
   mainWindow.on('unmaximize', () => {
     app.isMaximized = false;
   });