From e08c72f98c531fb94bc404082d8a28b1c0339d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Mon, 30 Oct 2017 12:26:15 +0100
Subject: [PATCH] Fixed issue with added a playlist to a recently cleared
 channel

---
 server/handlers/list_change.js       |  6 +++---
 server/public/assets/js/listeners.js |  1 +
 server/public/assets/js/player.js    | 11 ++++++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/server/handlers/list_change.js b/server/handlers/list_change.js
index 677287a9..52e2a947 100644
--- a/server/handlers/list_change.js
+++ b/server/handlers/list_change.js
@@ -21,8 +21,8 @@ function add_function(arr, coll, guid, offline, socket) {
                 var last = arr.num == arr.total - 1;
                 var num = arr.num;
                 var total = arr.total;
-                db.collection(coll).find({views:{$exists:true}}, function(err, docs)
-                {
+                /*db.collection(coll).find({views:{$exists:true}}, function(err, docs)
+                {*/
                     conf = docs;
                     if(docs !== null && docs.length !== 0 && ((docs[0].addsongs === true && (hash == docs[0].adminpass || docs[0].adminpass === "")) ||
                     docs[0].addsongs === false))
@@ -135,7 +135,7 @@ function add_function(arr, coll, guid, offline, socket) {
                             socket.emit("toast", "listhaspass");
                         }
                     }
-                });
+                //});
             } else {
                 socket.emit("auth_required");
             }
diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js
index 87ea7540..baa8c54f 100755
--- a/server/public/assets/js/listeners.js
+++ b/server/public/assets/js/listeners.js
@@ -12,6 +12,7 @@ var conf 			   	  		= [];
 var private_channel 			= false;
 var music 			   	  		= 0;
 var frontpage 		   	  		= 1;
+var empty_clear = false;
 var adminpass 		   	  		= "";
 var showDiscovery						= false;
 var temp_name = "";
diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js
index 09094a4e..a2e13625 100755
--- a/server/public/assets/js/player.js
+++ b/server/public/assets/js/player.js
@@ -153,6 +153,13 @@ var Player = {
             }
             duration = Player.player.getDuration();
         }
+
+        if(Object.keys(obj).length == 0) {
+            paused = false;
+            empty_clear = true;
+        } else {
+            empty_clear = false;
+        }
     },
 
     onPlayerStateChange: function(newState) {
@@ -208,7 +215,9 @@ var Player = {
                         $("#playpause").css("pointer-events", "all");
                         $("#channel-load").css("display", "none");
                     }
-                    paused = true;
+                    if(!empty_clear) {
+                        paused = true;
+                    }
                     if(window.location.pathname != "/") Playercontrols.play_pause_show();
                     mobile_beginning = true;
                 }