monor changes, gite merge

4 files changed, 10 insertions, 4 deletions

diff --git a/lib/epgservice.h b/lib/epgservice.h
index 1cd27b1..07c861f 100644
--- a/lib/epgservice.h
+++ b/lib/epgservice.h
@@ -107,6 +107,7 @@ enum TimerAction
 };
 
 // ATTENTION: Update type also in service.h when changing timer types here!!
+//  -> and at the skindesigner plugin!
 
 enum TimerType
 {
diff --git a/menusched.c b/menusched.c
index 8c3915b..f62afd3 100644
--- a/menusched.c
+++ b/menusched.c
@@ -154,8 +154,8 @@ cMenuEpgMatchRecordings::cMenuEpgMatchRecordings(cMenuDb* db, const cEvent* even
       const char* vdr = 0;
 
 #ifdef WITH_PIN
-         if (!cOsd::pinValid && menuDb->recordingListDb->getIntValue("FSK"))
-            continue;
+      if (!cOsd::pinValid && menuDb->recordingListDb->getIntValue("FSK"))
+         continue;
 #endif
 
       if (!menuDb->recordingListDb->getValue("OWNER")->isEmpty())
diff --git a/po/it_IT.po b/po/it_IT.po
index 4385faf..7204b5c 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VDR 1.5.7\n"
 "Report-Msgid-Bugs-To: <vdr@jwendel.de>\n"
-"POT-Creation-Date: 2018-02-12 08:57+0100\n"
+"POT-Creation-Date: 2018-02-12 15:20+0100\n"
 "PO-Revision-Date: 2009-08-27 21:45+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
diff --git a/timer.c b/timer.c
index 0bdc2b3..3295085 100644
--- a/timer.c
+++ b/timer.c
@@ -19,6 +19,7 @@
 int cUpdate::checkSwitchTimer()
 {
    cMutexLock lock(&swTimerMutex);
+   int res = fail;
 
    for (auto it = switchTimers.begin(); it != switchTimers.end(); )
    {
@@ -51,6 +52,8 @@ int cUpdate::checkSwitchTimer()
 
          if (!cDevice::PrimaryDevice()->SwitchChannel(channel, true))
             Skins.Message(mtError, tr("Can't switch channel!"));
+         else
+            res = success;
       }
 
       timerDb->clear();
@@ -61,6 +64,7 @@ int cUpdate::checkSwitchTimer()
       {
          timerDb->setCharValue("ACTION", taAssumed);
          timerDb->setCharValue("STATE", tsFinished);
+         timerDb->getValue("INFO")->sPrintf("Swich %s", res == success ? "succeeded" : "failed");
          timerDb->store();
       }
       else
@@ -463,6 +467,7 @@ int cUpdate::takeSwitchTimer()
 
          timerDb->setCharValue("ACTION", taAssumed);
          timerDb->setCharValue("STATE", tsFinished);
+         timerDb->setValue("INFO", "Removed, to old");
          timerDb->store();
          continue;
       }
@@ -494,7 +499,7 @@ int cUpdate::takeSwitchTimer()
       // that's special for switch timers since we have to get the 'pending' also after a vdr restart
 
       tell(1, "Got switch timer (%ld) for channel '%s' at '%s'",
-           timerDb->getIntValue("ID"), timerDb->getStrValue("CHANNELID"),
+           timerid, timerDb->getStrValue("CHANNELID"),
            l2pTime(timerDb->getIntValue("_STARTTIME") - tmeSecondsPerMinute).c_str());
 
       switchTimers[timerid].eventId = timerDb->getIntValue("EVENTID");