Series link fields were not being checked. Fixes #1318.

This commit is contained in:
Adam Sutton 2012-10-11 13:10:33 +01:00
parent a13f3b8119
commit 852e1ee397

View file

@ -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);