Merge branch 'hotfix/cloud_pc_v1.7.5' into develop

entrylabs · Jul 31, 2019 · f54fb5d · f54fb5d
2 parents bcda5be + 1fab5cb
commit f54fb5d
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/app/src/main/flasher.js b/app/src/main/flasher.js
@@ -1,4 +1,4 @@
-const { dialog } = require('electron');
+const { app, dialog } = require('electron');
 const exec = require('child_process').exec;
 const path = require('path');
 const fs = require('fs');
@@ -13,15 +13,15 @@ const platform = process.platform;
  */
 class Flasher {
     static get firmwareDirectoryPath() {
-        const asarIndex = __dirname.indexOf('app.asar');
+        const asarIndex = app.getAppPath().indexOf(`${path.sep}app.asar`);
         if (asarIndex > -1) {
-            const asarPath = __dirname.substr(0, asarIndex);
-            const externalFlahserPath = path.join(asarPath, 'firmwares');
-            const flasherPath = path.resolve(__dirname, '..', '..', 'firmwares');
-            if (!fs.existsSync(externalFlahserPath)) {
-                Utils.copyRecursiveSync(flasherPath, externalFlahserPath);
+            const asarPath = app.getAppPath().substr(0, asarIndex);
+            const externalFlasherPath = path.join(asarPath, 'firmwares');
+            const flasherPath = path.resolve(app.getAppPath(), __dirname, '..', '..', 'firmwares');
+            if (!fs.existsSync(externalFlasherPath)) {
+                Utils.copyRecursiveSync(flasherPath, externalFlasherPath);
             }
-            return externalFlahserPath;
+            return externalFlasherPath;
         } else {
             return path.resolve('app', 'firmwares');
         }