diff --git a/mythtv/libs/libmyth/programinfo.cpp b/mythtv/libs/libmyth/programinfo.cpp
index 3010351..3538a39 100644
a
|
b
|
bool ProgramInfo::IsSameProgram(const ProgramInfo& other) const |
1893 | 1893 | return false; |
1894 | 1894 | |
1895 | 1895 | if ((dupmethod & kDupCheckSubThenDesc) && |
1896 | | ((subtitle.isEmpty() && other.subtitle.isEmpty() && |
1897 | | description.toLower() != other.description.toLower()) || |
1898 | | (subtitle.toLower() != other.subtitle.toLower()) || |
1899 | | (description.isEmpty() && subtitle.isEmpty()))) |
| 1896 | ((subtitle.isEmpty() && |
| 1897 | ((!other.subtitle.isEmpty() && |
| 1898 | description.toLower() != other.subtitle.toLower()) || |
| 1899 | (other.subtitle.isEmpty() && |
| 1900 | description.toLower() != other.description.toLower()))) || |
| 1901 | (!subtitle.isEmpty() && |
| 1902 | ((other.subtitle.isEmpty() && |
| 1903 | subtitle.toLower() != other.description.toLower()) || |
| 1904 | (!other.subtitle.isEmpty() && |
| 1905 | subtitle.toLower() != other.subtitle.toLower()))))) |
1900 | 1906 | return false; |
1901 | 1907 | |
1902 | 1908 | return true; |
diff --git a/mythtv/programs/mythbackend/scheduler.cpp b/mythtv/programs/mythbackend/scheduler.cpp
index 195aea5..354de46 100644
a
|
b
|
void Scheduler::AddNewRecords(void) |
3684 | 3684 | " (((RECTABLE.dupmethod & 0x04) = 0) OR (program.description <> '' " |
3685 | 3685 | " AND program.description = oldrecorded.description)) " |
3686 | 3686 | " AND " |
3687 | | " (((RECTABLE.dupmethod & 0x08) = 0) OR (program.subtitle <> '' " |
3688 | | " AND program.subtitle = oldrecorded.subtitle) OR (program.subtitle = '' " |
3689 | | " AND oldrecorded.subtitle = '' AND program.description <> '' " |
3690 | | " AND program.description = oldrecorded.description)) " |
| 3687 | " (((RECTABLE.dupmethod & 0x08) = 0) OR " |
| 3688 | " (program.subtitle <> '' AND " |
| 3689 | " (program.subtitle = oldrecorded.subtitle OR " |
| 3690 | " (oldrecorded.subtitle = '' AND " |
| 3691 | " program.subtitle = oldrecorded.description))) OR " |
| 3692 | " (program.subtitle = '' AND program.description <> '' AND " |
| 3693 | " (program.description = oldrecorded.subtitle OR " |
| 3694 | " (oldrecorded.subtitle = '' AND " |
| 3695 | " program.description = oldrecorded.description)))) " |
3691 | 3696 | " ) " |
3692 | 3697 | " ) " |
3693 | 3698 | " ) " |
… |
… |
void Scheduler::AddNewRecords(void) |
3716 | 3721 | " (((RECTABLE.dupmethod & 0x04) = 0) OR (program.description <> '' " |
3717 | 3722 | " AND program.description = recorded.description)) " |
3718 | 3723 | " AND " |
3719 | | " (((RECTABLE.dupmethod & 0x08) = 0) OR (program.subtitle <> '' " |
3720 | | " AND program.subtitle = recorded.subtitle) OR (program.subtitle = '' " |
3721 | | " AND recorded.subtitle = '' AND program.description <> '' " |
3722 | | " AND program.description = recorded.description)) " |
| 3724 | " (((RECTABLE.dupmethod & 0x08) = 0) OR " |
| 3725 | " (program.subtitle <> '' AND " |
| 3726 | " (program.subtitle = recorded.subtitle OR " |
| 3727 | " (recorded.subtitle = '' AND " |
| 3728 | " program.subtitle = recorded.description))) OR " |
| 3729 | " (program.subtitle = '' AND program.description <> '' AND " |
| 3730 | " (program.description = recorded.subtitle OR " |
| 3731 | " (recorded.subtitle = '' AND " |
| 3732 | " program.description = recorded.description)))) " |
3723 | 3733 | " ) " |
3724 | 3734 | " ) " |
3725 | 3735 | " ) " |