From 852e1ee39721fafbefaeceb73410a7615d3449fd Mon Sep 17 00:00:00 2001 From: Adam Sutton Date: Thu, 11 Oct 2012 13:10:33 +0100 Subject: [PATCH] Series link fields were not being checked. Fixes #1318. --- src/dvr/dvr_autorec.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/dvr/dvr_autorec.c b/src/dvr/dvr_autorec.c index 5dae8ce8..447cbcba 100644 --- a/src/dvr/dvr_autorec.c +++ b/src/dvr/dvr_autorec.c @@ -77,11 +77,14 @@ autorec_cmp(dvr_autorec_entry_t *dae, epg_broadcast_t *e) (dae->dae_title == NULL || dae->dae_title[0] == '\0') && dae->dae_brand == NULL && - dae->dae_season == NULL) + dae->dae_season == NULL && + dae->dae_serieslink == NULL) return 0; // Avoid super wildcard match // Note: we always test season first, though it will only be set // if configured + if(dae->dae_serieslink) + if (!e->serieslink || dae->dae_serieslink != e->serieslink) return 0; if(dae->dae_season) if (!e->episode->season || dae->dae_season != e->episode->season) return 0; if(dae->dae_brand) @@ -199,9 +202,11 @@ autorec_entry_destroy(dvr_autorec_entry_t *dae) LIST_REMOVE(dae, dae_channel_tag_link); if(dae->dae_brand) - dae->dae_brand->putref((epg_object_t*)dae->dae_brand); + dae->dae_brand->putref(dae->dae_brand); if(dae->dae_season) - dae->dae_season->putref((epg_object_t*)dae->dae_season); + dae->dae_season->putref(dae->dae_season); + if(dae->dae_serieslink) + dae->dae_serieslink->putref(dae->dae_serieslink); TAILQ_REMOVE(&autorec_entries, dae, dae_link);