From a3c945ab425c2246aeada8c20a170d686d3d33f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Mon, 7 May 2018 16:16:13 +0200
Subject: [PATCH] Fix for offline-mode having now_playing object updated
 wrongly

---
 server/public/assets/js/listeners.js |  2 +-
 server/public/assets/js/player.js    | 44 ++++++++--------------------
 2 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js
index 3c8d59ac..94b54015 100755
--- a/server/public/assets/js/listeners.js
+++ b/server/public/assets/js/listeners.js
@@ -230,7 +230,7 @@ window.addEventListener("DOMContentLoaded", function() {
         var to_remove = document.querySelector(".connect_error");
         if(to_remove != null) {
             var instance = M.Toast.getInstance(to_remove);
-            instancce.dismiss();
+            instance.dismiss();
         }
         //before_toast();
     }
diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js
index a139af83..1fb29e8e 100755
--- a/server/public/assets/js/player.js
+++ b/server/public/assets/js/player.js
@@ -13,52 +13,32 @@ var Player = {
     },
 
     now_playing_listener: function(obj) {
+        if(offline && video_id != undefined) return;
         if(obj.np != undefined) {
+            video_id   = obj.np[0].id;
+            Player.np = obj.np[0];
+            Player.np.start = obj.np[0].start;
+            Player.np.end = obj.np[0].end;
+            Player.np.duration = obj.np[0].duration;
+            if(Player.np.start == undefined) Player.np.start = 0;
+            if(Player.np.end == undefined) Player.np.end = Player.np.duration;
+            song_title = obj.np[0].title;
+            duration   = obj.np[0].duration;
+
             if(offline && (video_id == "" || video_id == undefined) && !client){
-                video_id   = obj.np[0].id;
-                Player.np = obj.np[0];
-                Player.np.start = obj.np[0].start;
-                Player.np.end = obj.np[0].end;
-                Player.np.duration = obj.np[0].duration;
-                if(Player.np.start == undefined) Player.np.start = 0;
-                if(Player.np.end == undefined) Player.np.end = Player.np.duration;
 
-                if(!obj.np[0].hasOwnProperty("start")) {
-                    Player.np.start = 0;
-                }
 
-                if(!obj.np[0].hasOwnProperty("end")) {
-                    Player.np.end = Player.np.duration;
-                }
                 if(obj.conf != undefined) {
                     conf       = obj.conf[0];
                 }
                 time       = obj.time;
                 seekTo     = 0 + Player.np.start;
                 startTime = time - conf.startTime;
-                song_title = obj.np[0].title;
-                duration   = obj.np[0].duration;
+
                 videoSource = obj.np[0].hasOwnProperty("source") ? obj.np[0].source : "youtube";
                 Player.getTitle(song_title, viewers);
                 Player.loadVideoById(Player.np.id, duration, Player.np.start, Player.np.end);
             } else {
-                video_id   = obj.np[0].id;
-                Player.np = obj.np[0];
-                Player.np.start = obj.np[0].start;
-                Player.np.end = obj.np[0].end;
-                Player.np.duration = obj.np[0].duration;
-                if(Player.np.start == undefined) Player.np.start = 0;
-                if(Player.np.end == undefined) Player.np.end = Player.np.duration;
-
-                if(!obj.np[0].hasOwnProperty("start")) {
-                    Player.np.start = 0;
-                }
-
-                if(!obj.np[0].hasOwnProperty("end")) {
-                    Player.np.end = Player.np.duration;
-                }
-                song_title = obj.np[0].title;
-                duration   = obj.np[0].duration;
                 videoSource = obj.np[0].hasOwnProperty("source") ? obj.np[0].source : "youtube";
             }
         } else {