From 8acab6ef5b4e6bb689c18d6eced2ce9044b76016 Mon Sep 17 00:00:00 2001
From: "Michael Bradley, Jr" <michaelsbradleyjr@gmail.com>
Date: Mon, 17 Sep 2018 18:47:19 -0500
Subject: [PATCH] disable browser auto-open when webserver first starts, not
 the `open browser` console cmd

---
 lib/modules/webserver/index.js  | 7 ++-----
 lib/modules/webserver/server.js | 3 ++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/modules/webserver/index.js b/lib/modules/webserver/index.js
index ad11a1a2..285f0f78 100644
--- a/lib/modules/webserver/index.js
+++ b/lib/modules/webserver/index.js
@@ -22,7 +22,6 @@ class WebServer {
 
     this.host = this.webServerConfig.host;
     this.port = parseInt(this.webServerConfig.port, 10);
-    this._openBrowser = this.webServerConfig.openBrowser;
 
     this.events.emit("status", __("Starting Server"));
 
@@ -30,7 +29,8 @@ class WebServer {
       buildDir: this.buildDir,
       events: this.events,
       host: this.host,
-      port: this.port
+      port: this.port,
+      openBrowser: this.webServerConfig.openBrowser
     });
 
     this.events.on('webserver:config:change', () => {
@@ -136,9 +136,6 @@ class WebServer {
   }
 
   openBrowser(cb) {
-    if (!this._openBrowser) {
-      return cb();
-    }
     const _cb = () => { cb(); };
     return opn(
       `http://${canonicalHost(this.server.hostname)}:${this.server.port}`,
diff --git a/lib/modules/webserver/server.js b/lib/modules/webserver/server.js
index 4f631843..7f202129 100644
--- a/lib/modules/webserver/server.js
+++ b/lib/modules/webserver/server.js
@@ -13,6 +13,7 @@ class Server {
     this.hostname = dockerHostSwap(options.host) || defaultHost;
     this.isFirstStart = true;
     this.opened = false;
+    this.openBrowser = options.openBrowser;
   }
 
   start(callback) {
@@ -45,7 +46,7 @@ class Server {
         });
       },
       function openBrowser(next) {
-        if (self.opened) {
+        if (!self.openBrowser || self.opened) {
           return next();
         }
         self.opened = true;