summaryrefslogtreecommitdiff
path: root/javascript
diff options
context:
space:
mode:
authorM. Voerman <rekordc@gmail.com>2015-02-09 22:55:13 +0100
committerM. Voerman <rekordc@gmail.com>2015-02-09 22:55:13 +0100
commitbeddabadcd54ca5cac9f498fa4a931aac3a8e63e (patch)
tree76907907c9c3db22c752aaaf6323c3c53d948192 /javascript
parent93b4f48499d080aaeb7d407262fa2070d2b88a07 (diff)
downloadvdr-vipclient-beddabadcd54ca5cac9f498fa4a931aac3a8e63e.tar.gz
vdr-vipclient-beddabadcd54ca5cac9f498fa4a931aac3a8e63e.tar.bz2
bugfix, don't try to restart live stream when already playing recording
Diffstat (limited to 'javascript')
-rw-r--r--javascript/main.js10
1 files changed, 6 insertions, 4 deletions
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)
}
}
}