From fe0b84349a16c75deda0d74f61fd6e61dd71f728 Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Fri, 12 Oct 2018 13:46:25 -0400
Subject: [PATCH] update noserver and nobrowser and fix noserver

---
 cmd/cmd.js         | 4 ++--
 lib/core/config.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmd/cmd.js b/cmd/cmd.js
index 85bea0ea5..bf56a92dc 100644
--- a/cmd/cmd.js
+++ b/cmd/cmd.js
@@ -175,12 +175,12 @@ class Cmd {
           serverHost: options.host,
           client: options.client,
           locale: options.locale,
-          runWebserver: options.noserver === null ? null : !options.noserver,
+          runWebserver: !options.noserver ? null : false,
           useDashboard: !options.nodashboard,
           logFile: options.logfile,
           logLevel: options.loglevel,
           webpackConfigName: options.pipeline || 'development',
-          openBrowser: options.nobrowser === null ? null : !options.nobrowser
+          openBrowser: !options.nobrowser ? null : false
         });
       });
   }
diff --git a/lib/core/config.js b/lib/core/config.js
index 06897de63..c6e547f12 100644
--- a/lib/core/config.js
+++ b/lib/core/config.js
@@ -106,8 +106,8 @@ Config.prototype._updateBlockchainCors = function(){
   let webServerConfig = this.webServerConfig;
   let corsParts = [];
 
-  if(webServerConfig && webServerConfig.enabled) {
-    if(webServerConfig.host) corsParts.push(utils.buildUrlFromConfig(webServerConfig));
+  if(webServerConfig && webServerConfig.host) {
+    corsParts.push(utils.buildUrlFromConfig(webServerConfig));
   }
   if(storageConfig && storageConfig.enabled) {
     // if getUrl is specified in the config, that needs to be included in cors