3 files changed, 15 insertions, 17 deletions

diff --git a/History b/History
index a532d6d..e6b386f 100644
--- a/History
+++ b/History
@@ -17,7 +17,8 @@ VDR 1.7.29+
 	epginfo box was left active but invisible when pressed menu(green key didn't change audio but show epginfonext)
 	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 
+	Turn record key off
+	NYX remote hase no stopkey so key 'back' does the same as stop. 
 
 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 7d67bbb..39a1325 100644
--- a/javascript/main.js
+++ b/javascript/main.js
@@ -942,7 +942,7 @@ function onKeyDown(event) {
 	}
         break;
 
-   case "Menu":
+   case KEY_MENU:
 		if(isFullscreen) {
 			if(count) {
 				count = 0;
@@ -2149,7 +2149,7 @@ function onKeyMenu(keyCode) {
 		InitMenu(menu);
 	}
 	break;
-    case "Menu":
+    case KEY_MENU:
 	if (menu == 3 ) { play(channels[currChan]);MPDListener = 0;}
 	isSetupMenu = 0;
 	mainmenu.style.opacity = 0;
@@ -3588,10 +3588,6 @@ if (DelisOK) {
   } // end of switch
 } else { 
   switch(keyCode) {
-    case "BrowserBack":
-//		ShowInfo();
-//		osdepginfo.style.opacity = 1 - osdepginfo.style.opacity;
-		break;
     case "TV":
 	setResume();
 	play(channels[currChan]);
@@ -3648,7 +3644,7 @@ if (DelisOK) {
 	ShowMediaOSD();
 	break;
 
-   case "Menu":
+   case KEY_MENU:
 	epg_unactive();
 	osdmedia.style.opacity = 0;
 	osdmediatime.style.opacity = 0;
@@ -3668,10 +3664,6 @@ if (DelisOK) {
 	VolumeDown();
 	break;
 
-
-    case KEY_REC:
-    case KEY_REC2:
-	break;
     case "MediaRewind":
 	    if (mediaPlayer.getState() != mediaPlayer.STATE_IDLE) {
 	      mediaPlayer.play(-4000);
@@ -3684,6 +3676,11 @@ if (DelisOK) {
 	    showDisplay("FF", false, 100, 0 );
 	    }
     break;
+
+    case KEY_REC:
+    case KEY_REC2:
+	break;
+    case "BrowserBack":
     case "MediaStop":
 	    if (currMed == -1 || isPause == 1 || localRecording == 1) {
 		    if (localRecording == 1) { 
@@ -3760,7 +3757,6 @@ if (DelisOK) {
 
 	}
 	break;
-
     case KEY_5:
 	if (localRecording != 1 ) {
 	if (recMark.length>posMark && get_recordings == 1) {	
@@ -3787,9 +3783,6 @@ if (DelisOK) {
 	}
 	}
 	break;
-
-
-
     case KEY_3:
 	if (localRecording != 1 ) {
 		position += (mediaPlayer.getPosition()/1000) + 30;
diff --git a/javascript/settings.js b/javascript/settings.js
index cb9f802..498f70e 100644
--- a/javascript/settings.js
+++ b/javascript/settings.js
@@ -75,7 +75,7 @@ var RecCmdsIcon = new Array("","\uE005","","","","","","","","");
 
 var preRecTime = 300 ;// for local recordings time before recording in seconds
 var afterRecTime = 600 ; // for local recordings time after recording in seconds
-var No_rec_key = 1; // 0 = use rec_keys, 1 = don't use rec_keys, no server recording possible
+var No_rec_key = 0; // 0 = use rec_keys, 1 = don't use rec_keys, no server recording possible
 
 //
 // No need to change anything from here on.
@@ -156,6 +156,7 @@ var ChangeOK = 0;
 var Extok = 0;
 var count = 0;
 
+//Remote settings
 //keys
 var KEY_0 = "U+0030";
 var KEY_1 = "U+0031";
@@ -167,6 +168,7 @@ var KEY_6 = "U+0036";
 var KEY_7 = "U+0037";
 var KEY_8 = "U+0038";
 var KEY_9 = "U+0039";
+var KEY_MENU = "Menu";
 if (No_rec_key) {
 	var KEY_REC = "";
 	var KEY_REC2 = "";
@@ -205,6 +207,8 @@ var KEY_LEFT2 = "ScrollLeft";
 var KEY_UP2 = "ScrollUp";
 var KEY_DOWN2 = "ScrollDown";
 
+//End of Remote settings
+
 var eitCache = null;
 var events = null;
 var eitService = null;