[SCM] kodi-pvr-hts/master: delete schedules before deleting events, otherwise we end up deleting events unnecessarily in case the schedule is being deleted anyway

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

The following commit has been merged in the master branch:
commit 6e0cfaf0fcb51b760fd5f0708678bbde628f6497
Author: Sam Stenvall <neggelandia at gmail.com>
Date:   Sun Jul 26 19:53:24 2015 +0300

    delete schedules before deleting events, otherwise we end up deleting events
    unnecessarily in case the schedule is being deleted anyway

diff --git a/src/Tvheadend.cpp b/src/Tvheadend.cpp
index ef49238..ac5791a 100644
--- a/src/Tvheadend.cpp
+++ b/src/Tvheadend.cpp
@@ -1421,6 +1421,12 @@ void CTvheadend::SyncEpgCompleted ( void )
   if (!m_settings.bAsyncEpg || m_asyncState.GetState() > ASYNC_EPG)
     return;
 
+  /* Schedules */
+  utilities::erase_if(m_schedules, [](const ScheduleMapEntry &entry)
+  {
+    return entry.second.IsDirty();
+  });
+
   /* Events */
   for (auto &entry : m_schedules)
   {
@@ -1430,12 +1436,6 @@ void CTvheadend::SyncEpgCompleted ( void )
     });
   }
   
-  /* Schedules */
-  utilities::erase_if(m_schedules, [](const ScheduleMapEntry &entry)
-  {
-    return entry.second.IsDirty();
-  });
-
   /* Trigger updates */
   for (const auto &entry : m_schedules)
     TriggerEpgUpdate(entry.second.channel);

-- 
kodi-pvr-hts packaging