From 8b6f461fe0a83919d2fe54f6e84f6f18c5820d5a Mon Sep 17 00:00:00 2001
From: lukeIam <mail2skywalker@gmail.com>
Date: Fri, 29 Nov 2013 21:25:07 +0100
Subject: [PATCH] Webserver: -fix: serveraddess is not saved

---
 Vocaluxe/Website/js/main.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Vocaluxe/Website/js/main.js b/Vocaluxe/Website/js/main.js
index 8d7033da..7eb0f330 100644
--- a/Vocaluxe/Website/js/main.js
+++ b/Vocaluxe/Website/js/main.js
@@ -722,14 +722,13 @@ function pagebeforeshowDiscover() {
             if (address != null) {
                 var prom = request({ url: address + "isServerOnline" }, "Checking...").done(function () {
                     serverBaseAddress = address;
-                    window.localStorage.getItem("VocaluxeServerAddress", address);
+                    window.localStorage.setItem("VocaluxeServerAddress", address);
                     $.mobile.changePage("#login", { transition: "none" });
                 });
                 $(this).data('promise', prom);
                 return;
             }
         }
-
     } else {
         $.mobile.changePage("#login", { transition: "none" });
     }
@@ -924,11 +923,15 @@ function initDiscoverPageHandler() {
             if (address.slice(-1) != '/') {
                 address = address + '/';
             }
-            request({ url: address + "isServerOnline" }, "Checking...").done(function () {
-                serverBaseAddress = address;
-                window.localStorage.getItem("VocaluxeServerAddress", address);
-                $.mobile.changePage("#login", { transition: "slidefade" });
-            });
+            request({ url: address + "isServerOnline" }, "Checking...")
+                .done(function () {
+                    serverBaseAddress = address;
+                    window.localStorage.setItem("VocaluxeServerAddress", address);
+                    $.mobile.changePage("#login", { transition: "slidefade" });
+                })
+                .fail(function () {
+                    $('#discoverServerAddress').prop("value", "");
+                });
         }
     });