4 files changed, 22 insertions, 31 deletions

diff --git a/package-lock.json b/package-lock.json
index 81031a76c..50383111c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3977,11 +3977,6 @@
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
     },
-    "deep-equal": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz",
-      "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU="
-    },
     "deep-extend": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
@@ -4620,6 +4615,11 @@
         "unixify": "1.0.0"
       }
     },
+    "electron-is-dev": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/electron-is-dev/-/electron-is-dev-1.0.1.tgz",
+      "integrity": "sha512-iwM3EotA9HTXqMGpQRkR/kT8OZqBbdfHTnlwcxsjSLYqY8svvsq0MuujsWCn3/vtgRmDv/PC/gKUUpoZvi5C1w=="
+    },
     "electron-osx-sign": {
       "version": "0.4.11",
       "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.11.tgz",
@@ -4752,23 +4752,12 @@
       }
     },
     "electron-window-state": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/electron-window-state/-/electron-window-state-4.1.1.tgz",
-      "integrity": "sha1-azT9wxs4UU3+yLfI97XUrdtnYy0=",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/electron-window-state/-/electron-window-state-5.0.3.tgz",
+      "integrity": "sha512-1mNTwCfkolXl3kMf50yW3vE2lZj0y92P/HYWFBrb+v2S/pCka5mdwN3cagKm458A7NjndSwijynXgcLWRodsVg==",
       "requires": {
-        "deep-equal": "^1.0.1",
-        "jsonfile": "^2.2.3",
+        "jsonfile": "^4.0.0",
         "mkdirp": "^0.5.1"
-      },
-      "dependencies": {
-        "jsonfile": {
-          "version": "2.4.0",
-          "resolved": "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
-          "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        }
       }
     },
     "email-addresses": {
diff --git a/package.json b/package.json
index c91ad1bb2..03267c136 100644
--- a/package.json
+++ b/package.json
@@ -39,9 +39,10 @@
     "electron-dl": "1.12.0",
     "electron-fetch": "1.3.0",
     "electron-hunspell": "0.1.1",
+    "electron-is-dev": "1.0.1",
     "electron-react-titlebar": "0.8.1",
     "electron-updater": "4.0.6",
-    "electron-window-state": "^4.1.0",
+    "electron-window-state": "5.0.3",
     "fs-extra": "7.0.1",
     "gulp-cli": "1.2.2",
     "hex-to-rgba": "1.0.2",
diff --git a/src/environment.js b/src/environment.js
index e1762129b..73b1c7ab2 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -1,10 +1,12 @@
+import isDev from 'electron-is-dev';
+
 import { LIVE_API, DEV_API, LOCAL_API } from './config';
 
-export const isDevMode = Boolean(process.execPath.match(/[\\/]electron/));
+export const isDevMode = isDev;
 export const useLiveAPI = process.env.LIVE_API;
 export const useLocalAPI = process.env.LOCAL_API;
 
-let platform = process.platform;
+let { platform } = process;
 if (process.env.OS_PLATFORM) {
   platform = process.env.OS_PLATFORM;
 }
diff --git a/src/index.js b/src/index.js
index 8d3b04845..494fa97f1 100644
--- a/src/index.js
+++ b/src/index.js
@@ -4,24 +4,23 @@ import {
   shell,
   ipcMain,
 } from 'electron';
+import isDevMode from 'electron-is-dev';
 import fs from 'fs-extra';
 import path from 'path';
 import windowStateKeeper from 'electron-window-state';
 
+// Set app directory before loading user modules
+if (isDevMode) {
+  app.setPath('userData', path.join(app.getPath('appData'), 'FranzDev'));
+}
+
+/* eslint-disable import/first */
 import {
-  isDevMode,
   isMac,
   isWindows,
   isLinux,
 } from './environment';
-
 import { mainIpcHandler as basicAuthHandler } from './features/basicAuth';
-
-// DEV MODE: Save user data into FranzDev
-if (isDevMode) {
-  app.setPath('userData', path.join(app.getPath('appData'), 'FranzDev'));
-}
-/* eslint-disable import/first */
 import ipcApi from './electron/ipc-api';
 import Tray from './lib/Tray';
 import Settings from './electron/Settings';