From ed38c213ac7c535ef3dbdee113fa1642aa39d391 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Tue, 13 Mar 2018 17:55:56 +0100
Subject: [PATCH] Fixed issue with login-in

---
 server/handlers/io.js            | 2 +-
 server/handlers/list_settings.js | 2 +-
 server/public/assets/js/admin.js | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/server/handlers/io.js b/server/handlers/io.js
index bea7d02c..5f2b4968 100644
--- a/server/handlers/io.js
+++ b/server/handlers/io.js
@@ -45,7 +45,7 @@ module.exports = function() {
         });
 
         socket.on("logout", function() {
-            Functions.removeSessionAdminPass(Functions.getSession(socket), "", coll, function() {})
+            Functions.removeSessionAdminPass(Functions.getSession(socket), coll, function() {})
         });
 
         socket.on('chromecast', function(msg) {
diff --git a/server/handlers/list_settings.js b/server/handlers/list_settings.js
index 3d94d62d..fb112b4e 100644
--- a/server/handlers/list_settings.js
+++ b/server/handlers/list_settings.js
@@ -42,7 +42,7 @@ function password(inp, coll, guid, offline, socket) {
                     {
                         Functions.setSessionAdminPass(sessionId, inp.password, coll, function() {
                             db.collection(coll + "_settings").update({ id: "config" }, {$set:{adminpass:Functions.hash_pass(pw)}}, function(err, docs){
-                                if(adminpass != pw) {
+                                if(adminpass != pw && adminpass != "") {
                                     socket.emit("toast", "changedpass");
                                 } else {
                                     socket.emit("toast", "correctpass");
diff --git a/server/public/assets/js/admin.js b/server/public/assets/js/admin.js
index 8d99b285..018ca282 100755
--- a/server/public/assets/js/admin.js
+++ b/server/public/assets/js/admin.js
@@ -83,13 +83,14 @@ var Admin = {
         /*if(Crypt.get_pass(chan.toLowerCase())) {*/
             //Crypt.remove_pass(chan.toLowerCase());
         Admin.display_logged_out();
-        console.log(Admin.logged_in);
+
         if(Admin.logged_in) {
             socket.emit("logout");
             Materialize.toast("Logged out", 4000);
         } else {
             Materialize.toast("Not logged in", 4000);
         }
+        Admin.logged_in = false;
     },
 
     display_logged_out: function() {