diff --git a/mythtv/libs/libmyth/programinfo.cpp b/mythtv/libs/libmyth/programinfo.cpp
index f444b44..2fb65d0 100644
a
|
b
|
bool ProgramInfo::IsSameProgram(const ProgramInfo& other) const |
1982 | 1982 | if ((dupmethod & kDupCheckSubThenDesc) && |
1983 | 1983 | ((subtitle.isEmpty() && |
1984 | 1984 | ((!other.subtitle.isEmpty() && |
1985 | | description.compare(other.subtitle, Qt::CaseInsensitive) != 0) || |
| 1985 | description.left(other.subtitle.length()).compare(other.subtitle, Qt::CaseInsensitive) != 0) || |
1986 | 1986 | (other.subtitle.isEmpty() && |
1987 | 1987 | description.compare(other.description, Qt::CaseInsensitive) != 0))) || |
1988 | 1988 | (!subtitle.isEmpty() && |
1989 | 1989 | ((other.subtitle.isEmpty() && |
1990 | | subtitle.compare(other.description, Qt::CaseInsensitive) != 0) || |
| 1990 | subtitle.compare(other.description.left(subtitle.length()), Qt::CaseInsensitive) != 0) || |
1991 | 1991 | (!other.subtitle.isEmpty() && |
1992 | 1992 | subtitle.compare(other.subtitle, Qt::CaseInsensitive) != 0))))) |
1993 | 1993 | return false; |
diff --git a/mythtv/programs/mythbackend/scheduler.cpp b/mythtv/programs/mythbackend/scheduler.cpp
index 575fbce..754e810 100644
a
|
b
|
void Scheduler::UpdateDuplicates(void) |
3778 | 3778 | " (p.subtitle <> '' AND " |
3779 | 3779 | " (p.subtitle = oldrecorded.subtitle OR " |
3780 | 3780 | " (oldrecorded.subtitle = '' AND " |
3781 | | " p.subtitle = oldrecorded.description))) OR " |
| 3781 | " p.subtitle = LEFT(oldrecorded.description,CHAR_LENGTH(p.subtitle))))) OR " |
3782 | 3782 | " (p.subtitle = '' AND p.description <> '' AND " |
3783 | | " (p.description = oldrecorded.subtitle OR " |
| 3783 | " (oldrecorded.subtitle <> '' AND (LEFT(p.description,CHAR_LENGTH(oldrecorded.subtitle)) = oldrecorded.subtitle) OR " |
3784 | 3784 | " (oldrecorded.subtitle = '' AND " |
3785 | 3785 | " p.description = oldrecorded.description)))) " |
3786 | 3786 | " ) " |
… |
… |
void Scheduler::UpdateDuplicates(void) |
3816 | 3816 | " (p.subtitle <> '' AND " |
3817 | 3817 | " (p.subtitle = recorded.subtitle OR " |
3818 | 3818 | " (recorded.subtitle = '' AND " |
3819 | | " p.subtitle = recorded.description))) OR " |
| 3819 | " p.subtitle = LEFT(recorded.description,CHAR_LENGTH(p.subtitle))))) OR " |
3820 | 3820 | " (p.subtitle = '' AND p.description <> '' AND " |
3821 | | " (p.description = recorded.subtitle OR " |
| 3821 | " (recorded.subtitle <> '' AND (LEFT(p.description,CHAR_LENGTH(recorded.subtitle)) = recorded.subtitle) OR " |
3822 | 3822 | " (recorded.subtitle = '' AND " |
3823 | 3823 | " p.description = recorded.description)))) " |
3824 | 3824 | " ) " |