Browse Source

fix crash bug in Windows

MaysWind 6 years ago
parent
commit
6ef20cb8be
2 changed files with 11 additions and 27 deletions
  1. 10 26
      main/cmd.js
  2. 1 1
      main/main.js

+ 10 - 26
main/cmd.js

@@ -3,32 +3,16 @@
 const os = require('os');
 const yargs = require('yargs');
 
-const argv = (function () {
-    if (os.platform() === 'win32') {
-        return yargs
-            .usage('Usage: $0 <file> [options]')
-            .option('d', {
-                alias: 'development',
-                type: 'boolean',
-                describe: 'Enable Development Mode (press F12 to open DevTools)',
-            })
-            .command('$0 <file> [options]', 'Create new task from specified file')
-            .help('h')
-            .alias('h', 'help')
-            .parse(process.argv.slice(1));
-    } else if (os.platform() === 'darwin') {
-        return yargs
-            .usage('Usage: $0 [options]')
-            .option('d', {
-                alias: 'development',
-                type: 'boolean',
-                describe: 'Enable Development Mode (press F12 to open DevTools)',
-            })
-            .help('h')
-            .alias('h', 'help')
-            .parse(process.argv.slice(1));
-    }
-})();
+const argv = yargs
+    .usage('Usage: $0 <file> [options]')
+    .option('d', {
+        alias: 'development',
+        type: 'boolean',
+        describe: 'Enable Development Mode (press F12 to open DevTools)',
+    })
+    .help('h')
+    .alias('h', 'help')
+    .parse(process.argv.slice(1));
 
 module.exports = {
     argv: argv

+ 1 - 1
main/main.js

@@ -20,7 +20,7 @@ if (!singletonLock) {
     app.quit();
 }
 
-let filePathInCommandLine = cmd.argv.file;
+let filePathInCommandLine = process.argv.length > 1 && process.argv[1];
 
 function isEnableCloseToHide() {
     return tray.isEnabled() || os.platform() === 'darwin';