Update for protected channels

2 files changed, 10 insertions, 2 deletions

diff --git a/History b/History
index 77ad72a..5ce2026 100644
--- a/History
+++ b/History
@@ -2,6 +2,7 @@
 	Switch timer sets ChannelGroup.
 	When playing recordings key '0' rewinds to start of the recording.
 	Is_new flag unset when resume is set (without reloading recordings from server)
+	Setting protection on/off exits menu. Protection ON also jumps to ChannelGroup 0 & last played channel.
 
 0.13	Bug fixes.
 	Cosmetic fixes.
diff --git a/index.html b/index.html
index 21ecd89..0325b8f 100644
--- a/index.html
+++ b/index.html
@@ -1604,7 +1604,10 @@ function onKeyMenu(keyCode) {
 	case KEY_7:
 		if (menu == 1) {
 		ShowProtectedChannels = 1 - ShowProtectedChannels;
-		InitMenu(menu);
+		if (ShowProtectedChannels == 1) { ChanGroup = 0; currChan = defChan[ChanGroup]; play(currChan); }
+		isSetupMenu = 0;
+		mainmenu.style.opacity = 0;
+//		InitMenu(menu);
 		}
 	break;
 	case KEY_8:
@@ -2047,12 +2050,16 @@ if (DelisOK) {
         break;
     break;
     case "Down":
-	      mediaPlayer.play(0);
+	if (mediaPlayer.getState() != mediaPlayer.STATE_PAUSED) {
 	      showDisplay("PAUS", false, 100, 0 );
+	      mediaPlayer.play(0);
+	}
         break;
     case "Up":
+	if (mediaPlayer.getState() != mediaPlayer.STATE_PLAYING) {
 	      position = position + (mediaPlayer.getPosition()/1000);
 	      playRec((recLink[currMed] + "?time=" + position));
+	}
 	break;
   case "Accept":
 	osdmedia.style.opacity = 1 - osdmedia.style.opacity;