From d661d9977680b66defa65fbb5eeee88026bfcb7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Wed, 19 Sep 2018 11:08:22 +0200
Subject: [PATCH] Trying to mitigate song-change-error

---
 server/handlers/list.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/handlers/list.js b/server/handlers/list.js
index 70075e32..a93eade5 100644
--- a/server/handlers/list.js
+++ b/server/handlers/list.js
@@ -392,7 +392,11 @@ function change_song_post(coll, next_song, conf, callback, socket) {
                             io.to(coll).emit("channel", {type: "song_change", time: Functions.get_time(), remove: conf[0].removeplay});
                             send_play(coll);
                         } else {
-                            socket.to(coll).emit("channel", {type: "song_change", time: Functions.get_time(), remove: conf[0].removeplay});
+                            if(socket == undefined) {
+                                io.to(coll).emit("channel", {type: "song_change", time: Functions.get_time(), remove: conf[0].removeplay});
+                            } else {
+                                socket.to(coll).emit("channel", {type: "song_change", time: Functions.get_time(), remove: conf[0].removeplay});
+                            }
                             send_play(coll, socket, true);
                             callback();
                         }