1 files changed, 5 insertions, 2 deletions

diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 6969bf7f82..a6d2e92d17 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -185,11 +185,14 @@ if [ -z "$ZSH_NAME" ] && [ `basename \"$0\"` = `basename \"$BASH_SOURCE\"` ]; th
     }
     TOASTER_MANAGED=1
     export TOASTER_MANAGED=1
-    if ! webserverStartAll; then
+    if [ $WEBSERVER -gt 0 ] && ! webserverStartAll; then
         echo "Failed to start the web server, stopping" 1>&2;
         exit 1;
     fi
-    xdg-open http://0.0.0.0:$WEB_PORT/ >/dev/null 2>&1 &
+    if [ $WEBSERVER -gt 0 ]; then
+        echo "Starting browser..."
+        xdg-open http://127.0.0.1:$WEB_PORT/ >/dev/null 2>&1 &
+    fi
     trap trap_ctrlc SIGINT
     echo "Running. Stop with Ctrl-C"
     while [ $RUNNING -gt 0 ]; do