Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/mythtv/libs/libmyth/programinfo.cpp b/mythtv/libs/libmyth/programinfo.cpp
- index 9854e12..6488c05 100644
- --- a/mythtv/libs/libmyth/programinfo.cpp
- +++ b/mythtv/libs/libmyth/programinfo.cpp
- @@ -2027,9 +2027,6 @@ bool ProgramInfo::IsSameProgram(const ProgramInfo& other) const
- if (dupmethod & kDupCheckNone)
- return false;
- - if (title.compare(other.title, Qt::CaseInsensitive) != 0)
- - return false;
- -
- if (catType == kCategorySeries)
- {
- if (programid.endsWith("0000"))
- @@ -2052,6 +2049,9 @@ bool ProgramInfo::IsSameProgram(const ProgramInfo& other) const
- }
- }
- + if (title.compare(other.title, Qt::CaseInsensitive) != 0)
- + return false;
- +
- if ((dupmethod & kDupCheckSub) &&
- ((subtitle.isEmpty()) ||
- (subtitle.compare(other.subtitle, Qt::CaseInsensitive) != 0)))
- diff --git a/mythtv/programs/mythbackend/scheduler.cpp b/mythtv/programs/mythbackend/scheduler.cpp
- index dbb2be3..b21cc00 100644
- --- a/mythtv/programs/mythbackend/scheduler.cpp
- +++ b/mythtv/programs/mythbackend/scheduler.cpp
- @@ -3690,7 +3690,6 @@ void Scheduler::UpdateDuplicates(void)
- " ( "
- " RECTABLE.dupmethod > 1 AND "
- " oldrecorded.duplicate <> 0 AND "
- -" p.title = oldrecorded.title AND "
- " p.generic = 0 "
- " AND "
- " ( "
- @@ -3705,6 +3704,7 @@ void Scheduler::UpdateDuplicates(void)
- " (p.programid = '' OR oldrecorded.programid = '') " )
- + QString(
- " AND "
- +" p.title = oldrecorded.title AND "
- " (((RECTABLE.dupmethod & 0x02) = 0) OR (p.subtitle <> '' "
- " AND p.subtitle = oldrecorded.subtitle)) "
- " AND "
- @@ -3727,7 +3727,6 @@ void Scheduler::UpdateDuplicates(void)
- " ( "
- " RECTABLE.dupmethod > 1 AND "
- " recorded.duplicate <> 0 AND "
- -" p.title = recorded.title AND "
- " p.generic = 0 AND "
- " recorded.recgroup NOT IN ('LiveTV','Deleted') "
- " AND "
- @@ -3743,6 +3742,7 @@ void Scheduler::UpdateDuplicates(void)
- " (p.programid = '' OR recorded.programid = '') ")
- + QString(
- " AND "
- +" p.title = recorded.title AND "
- " (((RECTABLE.dupmethod & 0x02) = 0) OR (p.subtitle <> '' "
- " AND p.subtitle = recorded.subtitle)) "
- " AND "
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement