From b68fc778f1ea768077fbb9d4ce0ad4a71dbe68ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Tue, 6 Mar 2018 14:07:24 +0100
Subject: [PATCH] Fixed color-issue on entering a channel

---
 server/public/assets/js/functions.js | 2 +-
 server/public/assets/js/player.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/public/assets/js/functions.js b/server/public/assets/js/functions.js
index 74781654..361aa406 100644
--- a/server/public/assets/js/functions.js
+++ b/server/public/assets/js/functions.js
@@ -232,8 +232,8 @@ function setup_chat_listener(){
 }
 
 function setup_list_listener(){
-    socket.on("channel", List.channel_function);
     socket.on("color", Player.setBGimage);
+    socket.on("channel", List.channel_function);
 }
 
 function setup_playlist_listener(){
diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js
index 7f67edf8..a26064bb 100755
--- a/server/public/assets/js/player.js
+++ b/server/public/assets/js/player.js
@@ -618,7 +618,7 @@ var Player = {
 
     setBGimage: function(c){
         var color = c.color;
-        if(window.location.pathname != "/" && ((offline && c.only) || (!offline && !c.only))) {
+        if(window.location.pathname != "/" && ((offline && c.only) || (!offline && !c.only) || (!offline && c.only))) {
             document.getElementById("main-container").style.backgroundColor = Helper.rgbToHsl(color,true);
             $("meta[name=theme-color]").attr("content", Helper.rgbToHex(color[0], color[1], color[2]));
             var new_color =  Helper.rgbToHex(color[0], color[1], color[2]);