Smaller bugfixes

3 files changed, 8 insertions, 6 deletions

diff --git a/infosatepg.cpp b/infosatepg.cpp
index c580dee..89ae1b6 100644
--- a/infosatepg.cpp
+++ b/infosatepg.cpp
@@ -174,7 +174,7 @@ void cPluginInfosatepg::MainThreadHook(void)
 cString cPluginInfosatepg::Active(void)
 {
     // Returns a message string if shutdown should be postponed
-    if (!global->Locked())
+    if (!global->isLocked())
         return tr("Infosat plugin still working");
     return NULL;
 }
diff --git a/infosatepg.h b/infosatepg.h
index 1f6c22c..6a88e48 100644
--- a/infosatepg.h
+++ b/infosatepg.h
@@ -12,7 +12,7 @@
 #include "global.h"
 #include "status.h"
 
-static const char *VERSION        = "0.0.5";
+static const char *VERSION        = "0.0.6";
 static const char *DESCRIPTION    = trNOOP("Read EPG info from infosat");
 
 class cPluginInfosatepg : public cPlugin {
diff --git a/setup.cpp b/setup.cpp
index 1879e57..85521f5 100644
--- a/setup.cpp
+++ b/setup.cpp
@@ -75,17 +75,17 @@ void cMenuSetupInfosatepg::Store(void)
 eOSState cMenuSetupInfosatepg::Edit()
 {
     if (HasSubMenu() || Count()==0)
-        return osContinue;
+        return osBack;
     if (Current()>=chanCurrent)
     {
         int chanIndex=Current()-chanCurrent;
         if (chanIndex<global->InfosatChannels())
             return AddSubMenu(new cMenuSetupChannelMenu(global,chanIndex));
         else
-            return osContinue;
+            return osBack;
     }
     else
-        return osContinue;
+        return osBack;
 }
 
 eOSState cMenuSetupInfosatepg::ProcessKey(eKeys Key)
@@ -100,7 +100,9 @@ eOSState cMenuSetupInfosatepg::ProcessKey(eKeys Key)
             switch (Key)
             {
             case kOk:
-                return Edit();
+                state=Edit();
+                if (state==osBack) Store();
+                break;
             default:
                 break;
             }