2 files changed, 18 insertions, 19 deletions

diff --git a/.travis.yml b/.travis.yml
index d9d9452af..3ece585de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,9 +18,9 @@ notifications:
     secure: NjEDG+6YvJvFNwRT8t8XyVR145m+Pb1pmYgdBeuhqtJbMAr0IOb0lLLW9ixKEsL1NU+0R58QGiG9qqY+lLnMNpDYjzluFo0gQtl2NJrULT4xUFDSu65XTwoutKyvj+hoCsHiwrSrO2dHTx3ZK2vsSueg+8jM/xss7dTLA6BcTYl14wTOU37PqFQZk9JYR+Dfq1Jjhy/mq4BiAsb/1clNIulkjmRjSm6R0XT4ZsZZfj0ifXhL4cLGsUv2n+iePiX6bLwZPFjXV1COYTBafbCu17gw3nRMdNMMTDLbwrXXdJZFS/EjFOPgOhwF7CkZ3kSpB2ZIcAJxG7iAUl5j+jHBXc5dafRbjzE4oYve1vPexLoV3NjV76uANUFkcli6eHYD0uJoUJGBRbRGWp+8Bbw9EcBsn4s3vbf5XqHX3S46zvGgqX+LyhyMJQtEG/iv+9XOsOql18ryyejij0z1K7DxpI0gLV1ATZCphY1Fyz1yZDGlYN4ej/Rl2P1Q3yXilweJRF7Ts04w4U9iuP1u598/w++CKSu4q4EeEuqT/hIeFQUKUkwCEsO4xa39vhLPaxKrG9UEUH8OXN+NPZyTAK/LKuIX7C56O1kwvWNMWlPmTcvsq2RghvNTwgSGUIO0EKZKrQYAEG3Y/veSt5CgZoNzLgc/6Xj+g7daxUo9heLy26A=
 deploy:
   provider: s3
-  access_key_id: AKIAI6ZWIP2OWZUCXIGA
+  access_key_id: AKIAIVRBS4YFL4ZBLCLA
   secret_access_key:
-    secure: hhosIIS7M2j5D8ivNfVEy9jp6oI9x2YKzPS4yDzWutKbILoB2Ii7F6gnaj9l2I9HLX01FE5/jH69rZ5ftP3wmUuywYcsua+Cs5zCnkkjm65WBHnTf5wp91X/tgLtMJNRVWhkxCeVmY7Ijpotmi6rq3GbgCMe2Ok08SExwOdYiCuGWiG5QiIYI/XRPjoUCkP6k4KsZ27HOO2agyXzRRiCI0O2RsSrb41WD4SPlsIW8aECDSOCaF/lIm38o03Q+lX1PtfDjOz9nfu5UUPJDWJNE9rnsa9xbgnNS9qhg/bBOwhtN+21dYCdgScax25kqlnYfT3ZLxBdZSLeM0c0lElaxAdTV/EAYySpnXP2ErfD5sLqVwmcrImKzhGDjyWeQCSBRMC4xfor9taJpB0O0v7iRO7VxszJCYGoUgLAu8kvp2pqkt8s+3t5+JzWdXacHgbKXQkyQWBY1SQzatlqOAAa2wtRv1rk3Xb8czF+4CnJ8n4St4Voo7/pecMwC+KURPemwAEb40OHofj/aRlwgc/kmIV+VUBrPUro5+KJYoQz4zFCchuOa/W6fAN3R9RAn3m4nwxthxI2ckAVdbkJC5c100/NZhPzyfuS+FOLpQ2bbSYfHu/4D7Yji0Pn+Q9lysf27PnnK8m2Ol3eyh+t02CMs6FNW6Wq1YIqarEjF8ouQKE=
+    secure: LZ38b5DmVisSBfpuPN8IVNCe3C+hJYX88jV+/ifzlB6/h1VUU/w5B3xHNBoOC2P53D2htMtL7K1/JLxzKGmUsnOJe5boF0QmBPTXUVosurxwMPEuLotQucgqcOoFnJkq+BUziBy+uWsZnk6ECbI5hFHQJAM9iNjOcgrfK08NLYvtdwYKYXwhwSrN4dxBKkfRINgAqHCp6bMuH2Imgy9iM+Iy5ydMPUsKDRHj1ByJrhcb1nJTjWImH08IU970fEl0P2+bCV6nUTzc9x9mwaJAF6uaH9L44lLptHIhGgqAZGzwQ7z6ANJj3CJRWFbqW2/9/0+4YKhyBbE9TPIvWIXmVeoPm0nWLDfVDN2RwTGtv+oSgPS+UhcFTVanekKfrzMTVdi1jQ8LIL7Ur3DcXNhwTPuc7PjLPPuwTS2AQRkPMyyWLRAz40/YUepASRdqoVMYI+CZiwu2AZIoUr1HO1eXj/0rqC8t/mhUSOXTxNGRCP9SQTJ/FSaI5dZh3oY7bkz7uxDNbPvChcs7hPFqqhPUFIkX36DaDqjze6IqtZ6pDz7XTqzUET/Jgny9vGBypvGj5fJpYZJytqEs0SsPGQGaxSmAWjcPWQX56Tr98iwVvzAJ0hl7lJHVaEzuxoYmD0ijg2zysoZ7GPBXJg2n9W+QaS0KVuda1r+sQ6C2wY8yvi8=
   bucket: franz-travis
   region: eu-central-1
   local_dir: out
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 254e647f1..8435c9ab8 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -16,10 +16,6 @@ import Miner from '../lib/Miner';
 const { app, getCurrentWindow, powerMonitor } = remote;
 const defaultLocale = 'en-US';
 
-const appFolder = path.dirname(process.execPath);
-const updateExe = path.resolve(appFolder, '..', 'Update.exe');
-const exeName = path.basename(process.execPath);
-
 export default class AppStore extends Store {
   updateStatusTypes = {
     CHECKING: 'CHECKING',
@@ -173,24 +169,27 @@ export default class AppStore extends Store {
   @action _launchOnStartup({ enable, openInBackground }) {
     this.autoLaunchOnStart = enable;
 
-    const settings = {
+    let settings = {
       openAtLogin: enable,
-      openAsHidden: openInBackground,
-      path: updateExe,
-      args: [
-        '--processStart', `"${exeName}"`,
-      ],
     };
 
     // For Windows
-    if (openInBackground) {
-      settings.args.push(
-        '--process-start-args', '"--hidden"',
-      );
+    if (process.platform === 'win32') {
+      settings = Object.assign({
+        openAsHidden: openInBackground,
+        path: app.getPath('exe'),
+        args: [
+          '--processStart', `"${path.basename(app.getPath('exe'))}"`,
+        ],
+      }, settings);
+
+      if (openInBackground) {
+        settings.args.push(
+          '--process-start-args', '"--hidden"',
+        );
+      }
     }
 
-    app.setLoginItemSettings(settings);
-
     gaEvent('App', enable ? 'enable autostart' : 'disable autostart');
   }
 
@@ -319,7 +318,7 @@ export default class AppStore extends Store {
 
   _checkAutoStart() {
     const loginItem = app.getLoginItemSettings({
-      path: updateExe,
+      path: app.getPath('exe'),
     });
 
     this.autoLaunchOnStart = loginItem.openAtLogin;