From: Jaroslav Kysela <perex@perex.cz>
Date: Fri, 7 Dec 2018 21:58:35 +0000 (+0100)
Subject: dvr: move the initial dvr_autorec_purge_obsolete_timers() call to better place, fixes... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30332f8b3e733fc7fccaa6574a977da487499c0a;p=thirdparty%2Ftvheadend.git

dvr: move the initial dvr_autorec_purge_obsolete_timers() call to better place, fixes #5406

- dvr_entry_set_timer() must be called before
---

diff --git a/src/dvr/dvr_config.c b/src/dvr/dvr_config.c
index cbb9924c5..234894eb6 100644
--- a/src/dvr/dvr_config.c
+++ b/src/dvr/dvr_config.c
@@ -1527,6 +1527,15 @@ dvr_init(void)
   dvr_autorec_init();
   dvr_timerec_init();
   dvr_entry_init();
+
+  /* We update the autorec entries so any that are no longer matching
+   * the current schedule get deleted. This avoids the problem where
+   * autorec entries remain even when user has deleted the epgdb
+   * or modified their settings between runs.
+   */
+  tvhinfo(LS_DVR, "Purging obsolete autorec entries for current schedule");
+  dvr_autorec_purge_obsolete_timers();
+
   dvr_autorec_update();
   dvr_timerec_update();
   dvr_disk_space_init();
diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
index 8dea0aac6..972f1fa21 100644
--- a/src/dvr/dvr_db.c
+++ b/src/dvr/dvr_db.c
@@ -4977,13 +4977,6 @@ dvr_entry_init(void)
     }
     htsmsg_destroy(l);
   }
-  /* We update the autorec entries so any that are no longer matching
-   * the current schedule get deleted. This avoids the problem where
-   * autorec entries remain even when user has deleted the epgdb
-   * or modified their settings between runs.
-   */
-  tvhinfo(LS_DVR, "Purging obsolete autorec entries for current schedule");
-  dvr_autorec_purge_obsolete_timers();
   dvr_in_init = 0;
   /* process parent/child mapping */
   HTSMSG_FOREACH(f, rere) {