From: Herbert von Broeuschmeul Date: Fri, 31 May 2019 18:00:59 +0000 (+0200) Subject: bugfix for autorecs duplicate episode number detection in autorecs X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3a631404a5ba1c4e7a2751040c122c0098cf61a;p=thirdparty%2Ftvheadend.git bugfix for autorecs duplicate episode number detection in autorecs "record if different episode number" doesn't work as expected in the master branch: see https://tvheadend.org/issues/5632 With this modification, the season will be taken into account, as it was before, in order to determine if two episodes have different episode numbers or not. --- diff --git a/src/dvr/dvr_db.c b/src/dvr/dvr_db.c index ee8bb8130..701211850 100644 --- a/src/dvr/dvr_db.c +++ b/src/dvr/dvr_db.c @@ -1484,11 +1484,7 @@ typedef int (*_dvr_duplicate_fcn_t)(dvr_entry_t *de, dvr_entry_t *de2, void **au static int _dvr_duplicate_epnum(dvr_entry_t *de, dvr_entry_t *de2, void **aux) { - if (de->de_epnum.e_num && de2->de_epnum.e_num) - return de->de_epnum.e_num == de2->de_epnum.e_num; - if (de->de_epnum.text && de2->de_epnum.text) - return strcmp(de->de_epnum.text, de2->de_epnum.text) == 0; - return 0; + return ! epg_episode_number_cmp(&(de->de_epnum), &(de2->de_epnum)) ; } static int _dvr_duplicate_title(dvr_entry_t *de, dvr_entry_t *de2, void **aux)