diff --git a/mythtv/libs/libmyth/programinfo.h b/mythtv/libs/libmyth/programinfo.h
index 421e5cf..1340683 100644
|
a
|
b
|
bool LoadFromScheduler(
|
| 809 | 809 | AutoDeleteDeque<TYPE*> &destination, |
| 810 | 810 | bool &hasConflicts, |
| 811 | 811 | QString altTable = "", |
| 812 | | int recordid = -1) |
| | 812 | int recordid = -1, |
| | 813 | bool filter = true) |
| 813 | 814 | { |
| 814 | 815 | destination.clear(); |
| 815 | 816 | QList<TYPE> tmpList; |
| … |
… |
bool LoadFromScheduler(
|
| 837 | 838 | tmpList.push_back(*p); |
| 838 | 839 | programCount++; |
| 839 | 840 | |
| 840 | | if (recordid > 0 && p->GetRecordingRuleID() != static_cast<uint>(recordid)) |
| | 841 | if (filter && recordid > 0 && p->GetRecordingRuleID() != static_cast<uint>(recordid)) |
| 841 | 842 | { |
| 842 | 843 | delete p; |
| 843 | 844 | continue; |
| … |
… |
template<typename T>
|
| 880 | 881 | bool LoadFromScheduler(AutoDeleteDeque<T> &destination) |
| 881 | 882 | { |
| 882 | 883 | bool dummyConflicts; |
| 883 | | return LoadFromScheduler(destination, dummyConflicts, "", -1); |
| | 884 | return LoadFromScheduler(destination, dummyConflicts, "", -1, true); |
| 884 | 885 | } |
| 885 | 886 | |
| 886 | 887 | // Moved from programdetails.cpp/h, used by MythWelcome/MythShutdown |
diff --git a/mythtv/programs/mythfrontend/viewschedulediff.cpp b/mythtv/programs/mythfrontend/viewschedulediff.cpp
index c0218df..3e9ddd7 100644
|
a
|
b
|
void ViewScheduleDiff::fillList(void)
|
| 197 | 197 | bool dummy; |
| 198 | 198 | |
| 199 | 199 | LoadFromScheduler(m_recListBefore, dummy); |
| 200 | | LoadFromScheduler(m_recListAfter, dummy, m_altTable, m_recordid); |
| | 200 | LoadFromScheduler(m_recListAfter, dummy, m_altTable, m_recordid, false); |
| 201 | 201 | |
| 202 | 202 | std::stable_sort(m_recListBefore.begin(), m_recListBefore.end(), |
| 203 | 203 | comp_recstart_less_than); |