From 7b0d3c3232d595717c25b6b19af46a09bb7bb11a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Mon, 13 Nov 2017 14:39:43 +0100
Subject: [PATCH] Small adjustement to sending next song

---
 server/public/assets/js/embed.js     |  1 +
 server/public/assets/js/listeners.js |  1 +
 server/public/assets/js/player.js    | 31 ++++++++++++++++------------
 3 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/server/public/assets/js/embed.js b/server/public/assets/js/embed.js
index a0004916..f76acc7a 100755
--- a/server/public/assets/js/embed.js
+++ b/server/public/assets/js/embed.js
@@ -7,6 +7,7 @@ var player_ready = false;
 var list_html = $("#list-song-html").html();
 var w_p		= true;
 var lazy_load	= false;
+var end_programmatically = false;
 var embed = true;
 var vol	= 100;
 var adminpass = "";
diff --git a/server/public/assets/js/listeners.js b/server/public/assets/js/listeners.js
index 4d52ef8c..acec7a40 100755
--- a/server/public/assets/js/listeners.js
+++ b/server/public/assets/js/listeners.js
@@ -10,6 +10,7 @@ var searching 		   	  		= false;
 var time_regex 		   	  		= /P((([0-9]*\.?[0-9]*)Y)?(([0-9]*\.?[0-9]*)M)?(([0-9]*\.?[0-9]*)W)?(([0-9]*\.?[0-9]*)D)?)?(T(([0-9]*\.?[0-9]*)H)?(([0-9]*\.?[0-9]*)M)?(([0-9]*\.?[0-9]*)S)?)?/;
 var conf 			   	  		= [];
 var private_channel 			= false;
+var end_programmatically = false;
 var music 			   	  		= 0;
 var timed_remove_check;
 var slider_type = "horizontal";
diff --git a/server/public/assets/js/player.js b/server/public/assets/js/player.js
index 2e038254..5c667555 100755
--- a/server/public/assets/js/player.js
+++ b/server/public/assets/js/player.js
@@ -244,18 +244,24 @@ var Player = {
                 }
                 break;
             case YT.PlayerState.PAUSED:
-                if(!chromecastAvailable){
-                    if(beginning && mobile_beginning) {
-                        $("#playpause").css("visibility", "visible");
-                        $("#playpause").css("pointer-events", "all");
-                        $("#channel-load").css("display", "none");
+                if(end_programmatically) {
+                    paused = false;
+                    playing = false;
+                    end_programmatically = false;
+                } else {
+                    if(!chromecastAvailable){
+                        if(beginning && mobile_beginning) {
+                            $("#playpause").css("visibility", "visible");
+                            $("#playpause").css("pointer-events", "all");
+                            $("#channel-load").css("display", "none");
+                        }
+                        if(!empty_clear && !gotten_np) {
+                            paused = true;
+                        }
+                        if(gotten_np) gotten_np = false;
+                        if(window.location.pathname != "/") Playercontrols.play_pause_show();
+                        mobile_beginning = true;
                     }
-                    if(!empty_clear && !gotten_np) {
-                        paused = true;
-                    }
-                    if(gotten_np) gotten_np = false;
-                    if(window.location.pathname != "/") Playercontrols.play_pause_show();
-                    mobile_beginning = true;
                 }
                 break;
             case YT.PlayerState.BUFFERING:
@@ -639,9 +645,8 @@ var Player = {
                 }
 
                 if(Player.player.getCurrentTime() > Player.np.end && Player.player.getPlayerState() == YT.PlayerState.PLAYING) {
+                    end_programmatically = true;
                     Player.player.pauseVideo();
-                    playing = false;
-                    paused  = false;
 
                     if(!offline) {
                         socket.emit("end", {id: video_id, channel: chan.toLowerCase(), pass: embed ? '' : Crypt.crypt_pass(Crypt.get_userpass(chan.toLowerCase()))});