summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--History3
-rw-r--r--javascript/main.js18
2 files changed, 11 insertions, 10 deletions
diff --git a/History b/History
index e6b386f..008fe9e 100644
--- a/History
+++ b/History
@@ -18,7 +18,8 @@ VDR 1.7.29+
add to favorite now refreshes view
added keys from Motorola NYX remote. (Both up/down/left/right keys do the same)
Turn record key off
- NYX remote hase no stopkey so key 'back' does the same as stop.
+ NYX remote hase no stopkey so key 'back' does the same as stop.
+ Fixed Standby while playback
0.25 Get recordings from Streamdev, Restfulapi or SmartTVweb.
Check if SmartTVweb is on the server if not turn SmartTVweb options off
diff --git a/javascript/main.js b/javascript/main.js
index 39a1325..d8abb07 100644
--- a/javascript/main.js
+++ b/javascript/main.js
@@ -259,17 +259,17 @@ var numObjs = event.objectNames.length;
} else if(event.objectNames[i] == "var.io.state" && is.getObject(event.objectNames[i]) == "normal" && KillStream == 1){
play(channels[currChan]);
if(isMediaMenu) {
- if (mediaList.style.opacity == 0) {
- if (get_recordings == 1) {
- setTimeout("GetMarks(); getResume(); playRec(recLink[currMed]+ '?mode=streamtoend&time=' + position);",100);
- } else if (get_recordings == 2) {
+ if (medialist.style.opacity == 0) {
+ if (get_recordings == 1) {
+ setTimeout("GetMarks(); getResume(); playRec(recLink[currMed] + '?mode=streamtoend&time=' + position);",100);
+ } else if (get_recordings == 2) {
setTimeout("playRec(recLink[currMed]+ '?pos=time.' + position);",100);
- }
+ }
- } else {
- showDisplay("STOP", false, 100, 0 );
- showMediaList();
- }
+ } else {
+ showDisplay("STOP", false, 100, 0 );
+ showMediaList();
+ }
}
}
}