Merge commit 'openRepo/rb_osd_submenues' into rb_osd_submenues

1 files changed, 4 insertions, 2 deletions

diff --git a/menu.c b/menu.c
index 8706211..49da62b 100644
--- a/menu.c
+++ b/menu.c
@@ -27,7 +27,6 @@
 
 /*uncomment the following line to allow setting of PvrSetup.UseOnlyCard
 and StreamType.value via OSD menu (see README) */
-#define PVR_DEBUG
 
 #include "common.h"
 #include "submenu.h"
@@ -81,9 +80,12 @@ cPvrMenuSetup::cPvrMenuSetup()
 
 eOSState cPvrMenuSetup::ProcessKey(eKeys Key) {
   eOSState state = osUnknown;
-  if (Key == kOk || Key == kBack) {
+  if (Key == kOk && HasSubMenu()) {
     Store();
   }
+  if (Key == kBack && HasSubMenu()) {
+    newPvrSetup = PvrSetup;
+  }
   if (!HasSubMenu()) {
     if (Key == kOk) {
       const char* ItemText = Get(Current())->Text();