[SCM] kodi-pvr-hts/master: Fix instant timer support.

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

The following commit has been merged in the master branch:
commit 7a677ff6a561c78a4354f99fe54ba61a548379a5
Author: Kai Sommerfeld <kai.sommerfeld at gmx.com>
Date:   Fri May 20 09:56:07 2016 +0200

    Fix instant timer support.

diff --git a/pvr.hts/addon.xml.in b/pvr.hts/addon.xml.in
index 0b3b9f4..0cbe8b1 100644
--- a/pvr.hts/addon.xml.in
+++ b/pvr.hts/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.hts"
-  version="3.4.0"
+  version="3.4.1"
   name="Tvheadend HTSP Client"
   provider-name="Adam Sutton, Sam Stenvall, Lars Op den Kamp, Kai Sommerfeld">
   <requires>
diff --git a/pvr.hts/changelog.txt b/pvr.hts/changelog.txt
index d1b551c..eef4462 100644
--- a/pvr.hts/changelog.txt
+++ b/pvr.hts/changelog.txt
@@ -1,3 +1,6 @@
+3.4.1
+- Fix instant timers
+
 3.4.0
 - Cmake: rename find_package kodi to Kodi
 
diff --git a/src/Tvheadend.cpp b/src/Tvheadend.cpp
index 3877d84..d81edb5 100644
--- a/src/Tvheadend.cpp
+++ b/src/Tvheadend.cpp
@@ -976,7 +976,9 @@ PVR_ERROR CTvheadend::AddTimer ( const PVR_TIMER &timer )
 
     /* Build message */
     htsmsg_t *m = htsmsg_create_map();
-    if (timer.iEpgUid > PVR_TIMER_NO_EPG_UID && timer.iTimerType == TIMER_ONCE_EPG)
+
+    int64_t start = timer.startTime;
+    if (timer.iEpgUid > PVR_TIMER_NO_EPG_UID && timer.iTimerType == TIMER_ONCE_EPG && start != 0)
     {
       /* EPG-based timer */
       htsmsg_add_u32(m, "eventId",      timer.iEpgUid);
@@ -986,7 +988,6 @@ PVR_ERROR CTvheadend::AddTimer ( const PVR_TIMER &timer )
       /* manual timer */
       htsmsg_add_str(m, "title",        timer.strTitle);
 
-      int64_t start = timer.startTime;
       if (start == 0)
       {
         /* Instant timer. Adjust start time to 'now'. */

-- 
kodi-pvr-hts packaging