[SCM] kodi-pvr-hts/master: Fix schedules dirty flag handling.

tiber-guest at users.alioth.debian.org tiber-guest at users.alioth.debian.org
Wed Mar 2 23:01:57 UTC 2016


The following commit has been merged in the master branch:
commit 14e384b82410c05180590ff2a0774dc002a3c08a
Author: Kai Sommerfeld <kai.sommerfeld at gmx.com>
Date:   Thu Jan 14 16:59:17 2016 +0100

    Fix schedules dirty flag handling.

diff --git a/src/Tvheadend.cpp b/src/Tvheadend.cpp
index 7671a94..f4aff44 100644
--- a/src/Tvheadend.cpp
+++ b/src/Tvheadend.cpp
@@ -2109,6 +2109,7 @@ void CTvheadend::ParseEventAddOrUpdate ( htsmsg_t *msg, bool bAdd )
   Event    &evt    = events[tmp.GetId()];
   Event comparison = evt;
   sched.SetId(tmp.GetChannel());
+  sched.SetDirty(false);
   evt.SetId(tmp.GetId());
   evt.SetDirty(false);
   
diff --git a/src/tvheadend/entity/Schedule.cpp b/src/tvheadend/entity/Schedule.cpp
index 6a61c9a..17c7293 100644
--- a/src/tvheadend/entity/Schedule.cpp
+++ b/src/tvheadend/entity/Schedule.cpp
@@ -27,9 +27,12 @@ void Schedule::SetDirty(bool dirty)
 {
   Entity::SetDirty(dirty);
 
-  // Mark all events as dirty too
-  for (auto &entry : m_events)
-    entry.second.SetDirty(dirty);
+  if (dirty)
+  {
+    // Mark all events as dirty too
+    for (auto &entry : m_events)
+      entry.second.SetDirty(dirty);
+  }
 }
 
 Segment Schedule::GetSegment(time_t startTime, time_t endTime) const

-- 
kodi-pvr-hts packaging



More information about the pkg-multimedia-commits mailing list