Fixed bug reported by ALT255 (markad stops when VDR deletes the timer after a recording)

Fixed bug reported by Copperhead (saving setup values was broken)
Added logos for SIXX and NICK_COMEDY

4 files changed, 7 insertions, 1 deletions

diff --git a/command/logos/NICK_COMEDY-A16_9-P0.pgm b/command/logos/NICK_COMEDY-A16_9-P0.pgm
new file mode 100644
index 0000000..b20d7a6
--- /dev/null
+++ b/command/logos/NICK_COMEDY-A16_9-P0.pgm
diff --git a/command/logos/SIXX-A16_9-P0.pgm b/command/logos/SIXX-A16_9-P0.pgm
new file mode 100644
index 0000000..9fe88b1
--- /dev/null
+++ b/command/logos/SIXX-A16_9-P0.pgm
diff --git a/plugin/setup.cpp b/plugin/setup.cpp
index 99090ed..f67b4c6 100644
--- a/plugin/setup.cpp
+++ b/plugin/setup.cpp
@@ -99,7 +99,12 @@ eOSState cSetupMarkAd::ProcessKey(eKeys Key)
 
     case osUnknown:
         if ((Key==kBlue) && (Current()==lpos))
-            return AddSubMenu(new cSetupMarkAdList(setup));;
+            return AddSubMenu(new cSetupMarkAdList(setup));
+        if (Key==kOk)
+        {
+            Store();
+            state=osBack;
+        }
         break;
 
     default:
diff --git a/plugin/status.cpp b/plugin/status.cpp
index ad088c1..21be601 100644
--- a/plugin/status.cpp
+++ b/plugin/status.cpp
@@ -126,6 +126,7 @@ void cStatusMarkAd::TimerChange(const cTimer *Timer, eTimerChange Change)
 {
     if (!Timer) return;
     if (Change!=tcDel) return;
+    if (time(NULL)>=Timer->Stop()) return; // don't react on normal VDR timer deletion after recording
     Remove(Timer->File(),true);
 }