From beddabadcd54ca5cac9f498fa4a931aac3a8e63e Mon Sep 17 00:00:00 2001 From: "M. Voerman" Date: Mon, 9 Feb 2015 22:55:13 +0100 Subject: bugfix, don't try to restart live stream when already playing recording --- History | 1 + javascript/main.js | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/History b/History index 46598c6..9a7f800 100644 --- a/History +++ b/History @@ -11,6 +11,7 @@ VDR 1.7.29+ Don't start the stream on boot or reload of the script if box is in standby Fixed error getting german languages file. Get server ip from flash + Bugfix, removed delayed play (in case of error) when you already start to play a recording 0.26 Fix for [undefined] in (search)timer menu when there are no (search)timers on server Changed Plugin check, only check if digit 1,2,3 from server ip & box ip are the same. diff --git a/javascript/main.js b/javascript/main.js index e797dc2..d8be2a4 100644 --- a/javascript/main.js +++ b/javascript/main.js @@ -3671,11 +3671,13 @@ if (DelisOK) { recList[currMed] = "\u0003" + recList[currMed].substring(1); medialist.style.opacity = 0; if (get_recordings == 1) { - setTimeout("GetMarks(); getResume(); playRec(recLink[currMed]+ '?mode=streamtoend&time=' + position);",100); + if (initialDelayPlayID != -1) { clearTimeout(initialDelayPlayID); initialDelayPlayID = -1; } + setTimeout("GetMarks(); getResume(); playRec(recLink[currMed]+ '?mode=streamtoend&time=' + position);",100); } else if (get_recordings == 2) { -// setTimeout("playRec(recLink[currMed]+ '?pos=resume');position = (mediaPlayer.getPosition()/1000);",100) - position = 0; - setTimeout("playRec(recLink[currMed]);",100) +// setTimeout("playRec(recLink[currMed]+ '?pos=resume');position = (mediaPlayer.getPosition()/1000);",100) + if (initialDelayPlayID != -1) { clearTimeout(initialDelayPlayID); initialDelayPlayID = -1; } + position = 0; + setTimeout("playRec(recLink[currMed]);",100) } } } -- cgit v1.2.3