[SCM] kodi-pvr-hts/master: Fix cancel recording for timers created by autorec or timerec.

[tiber-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 16788bf867db8133f7de4c7c75c636eb7e642748
Author: Kai Sommerfeld <kai.sommerfeld at gmx.com>
Date:   Tue Nov 3 15:11:35 2015 +0100

    Fix cancel recording for timers created by autorec or timerec.

diff --git a/src/Tvheadend.cpp b/src/Tvheadend.cpp
index 6ec6bd5..1dfad21 100644
--- a/src/Tvheadend.cpp
+++ b/src/Tvheadend.cpp
@@ -1060,6 +1060,22 @@ PVR_ERROR CTvheadend::DeleteTimer
     /* EPG-query-based repeating timer */
     return m_autoRecordings.SendAutorecDelete(timer);
   }
+  else if ((timer.iTimerType == TIMER_ONCE_CREATED_BY_TIMEREC) ||
+           (timer.iTimerType == TIMER_ONCE_CREATED_BY_AUTOREC))
+  {
+    /* Read-only timer created by autorec or timerec */
+    const auto &it = m_recordings.find(timer.iClientIndex);
+    if (it != m_recordings.end() && it->second.IsRecording())
+    {
+      /* This is actually a request to cancel an active recording. */
+      return SendDvrDelete(timer.iClientIndex, "cancelDvrEntry");
+    }
+    else
+    {
+      tvherror("timer is read-only");
+      return PVR_ERROR_INVALID_PARAMETERS;
+    }
+  }
   else
   {
     /* unknown timer */

-- 
kodi-pvr-hts packaging