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

- dvr_entry_set_timer() must be called before

diff --git a/src/dvr/dvr_config.c b/src/dvr/dvr_config.c
index cbb9924c51f915384bb51ced9d6358435afc876e..234894eb6f084b48356bf7594d00fa561bf1308b 100644 (file)
--- 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 8dea0aac6a1b587ecb0733b71ea32fc8bf9e81f8..972f1fa2134a35204b56602747201abf59736875 100644 (file)
--- 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) {