From 9727ef203962423e9d9ec727e7def6bd92a7be7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Thu, 31 May 2018 22:24:25 +0200
Subject: [PATCH] Sorting list and added a fallback on crash

---
 server/handlers/io.js           | 5 ++++-
 server/public/assets/js/list.js | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/handlers/io.js b/server/handlers/io.js
index d7ff6c2f..3d84677e 100644
--- a/server/handlers/io.js
+++ b/server/handlers/io.js
@@ -568,10 +568,13 @@ module.exports = function() {
             if(obj == undefined && coll != undefined) {
                 obj = {};
                 obj.channel = coll;
-            } else if(obj.hasOwnProperty("channel") && obj.channel.indexOf("?") > -1){
+            } else if(obj != undefined && obj.hasOwnProperty("channel") && obj.channel.indexOf("?") > -1){
                 var _list = obj.channel.substring(0, obj.channel.indexOf("?"));
                 obj.channel = _list;
             }
+            if(obj == undefined && coll == undefined) {
+                return;
+            }
             if(obj.hasOwnProperty("channel")) {
                 obj.channel = Functions.encodeChannelName(obj.channel);
             }
diff --git a/server/public/assets/js/list.js b/server/public/assets/js/list.js
index 29da6059..e305486d 100755
--- a/server/public/assets/js/list.js
+++ b/server/public/assets/js/list.js
@@ -178,7 +178,7 @@ var List = {
                 full_playlist[x].votes = 0;
             }
         }
-        //List.sortList();
+        List.sortList();
 
         Helper.setHtml("#wrapper", "");