From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 2 Mar 2016 11:04:34 +0000 (+0100)
Subject: DVR autorec: another inconsistency fixes (missing or extra schedules)
X-Git-Tag: v4.2.1~969
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=52ed7734616c36f5c1d1969b752ec85d13e1c8fe;p=thirdparty%2Ftvheadend.git

DVR autorec: another inconsistency fixes (missing or extra schedules)
---

diff --git a/src/api/api_dvr.c b/src/api/api_dvr.c
index 3e3d9d637..1ed2f633a 100644
--- a/src/api/api_dvr.c
+++ b/src/api/api_dvr.c
@@ -382,8 +382,11 @@ api_dvr_autorec_create
   if (cfg) {
     htsmsg_set_str(conf, "config_name", idnode_uuid_as_str(&cfg->dvr_id, ubuf));
     dae = dvr_autorec_create(NULL, conf);
-    if (dae)
+    if (dae) {
       idnode_changed(&dae->dae_id);
+      dvr_autorec_changed(dae, 0);
+      dvr_autorec_completed(dae, 0);
+    }
   }
   pthread_mutex_unlock(&global_lock);
 
diff --git a/src/dvr/dvr_autorec.c b/src/dvr/dvr_autorec.c
index 8765f83db..747dd6039 100644
--- a/src/dvr/dvr_autorec.c
+++ b/src/dvr/dvr_autorec.c
@@ -296,9 +296,6 @@ dvr_autorec_create(const char *uuid, htsmsg_t *conf)
 
   idnode_load(&dae->dae_id, conf);
 
-  dvr_autorec_changed(dae, 1);
-  dvr_autorec_completed(dae, 0);
-
   htsp_autorec_entry_add(dae);
 
   return dae;
@@ -1313,6 +1310,7 @@ dvr_autorec_update(void)
   dvr_autorec_entry_t *dae;
   TAILQ_FOREACH(dae, &autorec_entries, dae_link) {
     dvr_autorec_changed(dae, 0);
+    dvr_autorec_completed(dae, 0);
   }
 }
 
diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c
index 8139b929b..0c07eb13d 100644
--- a/src/dvr/dvr_db.c
+++ b/src/dvr/dvr_db.c
@@ -756,7 +756,7 @@ dvr_entry_create(const char *uuid, htsmsg_t *conf, int clone)
           lang_str_get(de->de_title, NULL), DVR_CH_NAME(de),
           (int64_t)de2->de_start, de->de_creator ?: "",
           idnode_uuid_as_str(&de2->de_id, ubuf));
-        dvr_entry_destroy(de, 0);
+        dvr_entry_destroy(de, 1);
         return NULL;
       }
   }