Parts of the mainmenu are accessible when playing recordings

2 files changed, 23 insertions, 10 deletions

diff --git a/index.html b/index.html
index d3911db..e1fe7e7 100644
--- a/index.html
+++ b/index.html
@@ -356,10 +356,10 @@ function FullScreen() {
 function onKeyDown(event) {
     if(isVisible) {
  	onKeyTeletext(event.keyIdentifier);
-    } else if(isMediaMenu) {
-	onKeyMedia(event.keyIdentifier);
     } else if(isSetupMenu) {
 	onKeyMenu(event.keyIdentifier);
+    } else if(isMediaMenu) {
+	onKeyMedia(event.keyIdentifier);
     } else {
 
     switch(event.keyIdentifier) {
@@ -1599,9 +1599,9 @@ function onKeyMenu(keyCode) {
 		osdepginfo.style.opacity = 0;
 		break;
 		}
-	if (menu !== 0) {
+	if (menu !== MainMenu) {
 		if (menu == 3 ) { isFullscreen = 0; play(channels[currChan]); isFullscreen = 1;MPDListener = 0;}
-		menu = 0;	
+		menu = MainMenu;
 		InitMenu(menu);
 		break;
 		}
@@ -1639,7 +1639,7 @@ function onKeyMenu(keyCode) {
 		InitMenu(menu);
     break;
     case "Accept":
-    	if (menu == 2) {
+    	if (menu == 2 && isMediaMenu !== 1) {
 		var x = toi.schedulerService.getParameter(timerID, "assetURI");
 		getRecOK = 0;
 		LoadMediaSettings();
@@ -1714,7 +1714,7 @@ function onKeyMenu(keyCode) {
     case "TV":
     break;
 	case KEY_1:
-		if (menu == 0) {
+		if (menu == MainMenu) {
 		menu = 1;
 		} else if (menu == 1) {
 		 ShowSubs = 1 - ShowSubs;
@@ -1724,7 +1724,7 @@ function onKeyMenu(keyCode) {
 	InitMenu(menu);
 	break;
 	case KEY_2:
-		if (menu == 0) {
+		if (menu == MainMenu) {
 			LoadTimers();
 				if (timer.length !== 0) { do { timerID = timerID + 1; } while (!timer[timerID] && (timerID < timer.length)) }
 			menu = 2;
@@ -1784,7 +1784,7 @@ function onKeyMenu(keyCode) {
 		}
 	break;
 	case KEY_5:
-		if (menu == 0) {
+		if (menu == MainMenu) {
 			mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> Timers </center></h1><pre style='color:black;font-size:" + fsMenu + ";'>\n\n\n<center> PLEASE WAIT </center></pre>";
 			timerID = 0;
 			menu = 5;
@@ -1867,9 +1867,9 @@ function onKeyMenu(keyCode) {
 		InitMenu(menu);
 	break;
 	case KEY_0:
-		if (menu !== 0) {
+		if (menu !== MainMenu) {
 		if (menu == 3 ) { isFullscreen = 0; play(channels[currChan]); isFullscreen = 1; MPDListener = 0;}
-		menu = 0;	
+		menu = MainMenu;	
 		InitMenu(menu);
 		}
 	break;
@@ -1905,10 +1905,16 @@ function InitMenu(menu) {
 osdepginfo.style.opacity = 0;
 
 if(menu == 0) { // Main Menu
+	MainMenu = 0;
 	mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> MainMenu \n ( " + Version + " )</center></h1><pre style='color:black;font-size:" + fsMenu + ";'>   1 - Settings \n   2 - Timers\n   3 - EPG\n   4 - Server : Recordings\n   5 - Server : Timers\n   6 - Server : EPG\n   7 - Server : Media Directory\n\n   9 - MPD Server Connection\n\n   BLUE - Restart Portal </pre>";
+}
 
+if(menu == 6) { // Main Menu when watching recording
+	MainMenu = 6;
+	mainmenu.innerHTML = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> MainMenu \n ( " + Version + " )</center></h1><pre style='color:black;font-size:" + fsMenu + ";'>   1 - Settings \n   2 - Timers\n\n\n   5 - Server : Timers\n\n\n\n\n\n </pre>";
 }
 
+
 if(menu == 1) { // settings menu
 	var htmltext = "<h1><center style='font-size:" + fsMenuMain + ";color:white;'> Settings </center></h1><pre style='color:black;font-size:" + fsMenu + ";'>   1 - ";
 	if (ShowSubs) { htmltext = htmltext + "\uE017"; } else { htmltext = htmltext + "\uE016"; }
@@ -2420,6 +2426,12 @@ if (DelisOK) {
 	osdepginfo.style.opacity = 1 - osdepginfo.style.opacity;
 	break;
    case "Menu":
+	osdepginfo.style.opacity = 0;
+	osdepginfonext.style.opacity = 0;
+	isSetupMenu = 1;
+	mainmenu.style.opacity = 0.8;
+	menu = 6;
+	InitMenu(menu);
 	break;
 
     case "VolumeMute":
diff --git a/settings.js b/settings.js
index ab755e9..0b57454 100644
--- a/settings.js
+++ b/settings.js
@@ -82,6 +82,7 @@ var isMediaMenu = 0;
 var isVisible = 0;
 var isSetupMenu = 0;
 var isSchedule = 0;
+var MainMenu = 0;
 var mediaPlayer = null;
 var Change = 0;
 var ChangeOK = 0;