Merge branch 'dev' into enhancement/package-names

particl · Jan 17, 2018 · 33bbe34 · 33bbe34
2 parents 2a090f3 + c2d1a9f
commit 33bbe34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/main.js b/main.js
@@ -32,6 +32,9 @@ let openDevTools = false;
 if (process.argv.includes('-opendevtools'))
   openDevTools = true;
 
+if (app.getVersion().includes('RC'))
+  process.argv.push(...['-testnet', '-printtoconsole']);
+
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.

diff --git a/modules/daemon/daemon.js b/modules/daemon/daemon.js
@@ -91,7 +91,7 @@ exports.start = function (wallets, callback) {
 exports.wait = function(wallets, callback) {
   return new Promise((resolve, reject) => {
 
-    const maxRetries  = 10; // Some slow computers...
+    const maxRetries  = 100; // Some slow computers...
     let   retries     = 0;
     let   errorString = '';
 
@@ -117,7 +117,6 @@ exports.wait = function(wallets, callback) {
         }
         log.error('Could not connect to daemon.')
         reject();
-        electron.app.exit();
       }
     } /* daemonStartup */