2 files changed, 5 insertions, 2 deletions
diff --git a/menu.c b/menu.c
index 274e9fb..49da62b 100644
--- a/menu.c
+++ b/menu.c
@@ -80,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();
diff --git a/pvrinput.c b/pvrinput.c
index 035f176..7200dcd 100644
--- a/pvrinput.c
+++ b/pvrinput.c
@@ -6,7 +6,7 @@
 #endif
 #endif
 
-static const char *VERSION        = "2010-07-19-rb_osd_submenus";
+static const char *VERSION        = "2010-07-22-rb_osd_submenus";
 static const char *DESCRIPTION    = tr("use Hauppauge PVR as input device");
 static const char *MAINMENUENTRY  = tr("PVR picture settings");