summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Engel <dengel@mythtv.org>2011-08-16 19:39:53 (GMT)
committer David Engel <dengel@mythtv.org>2011-08-16 19:39:53 (GMT)
commit20abad4445c800d7152cd01e035ae8e65e4bfc47 (patch)
tree685799cabe0f04e5012b97385a22138cddac0e49
parent8b9c59536fe78e81852cd62a0600690ebbb99864 (diff)
Minor update to 8b9c5953.
Re-fix the scheduler ordering in the very rare case where a program is being recorded multiple times on the same channel.
-rw-r--r--mythtv/programs/mythbackend/scheduler.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/mythtv/programs/mythbackend/scheduler.cpp b/mythtv/programs/mythbackend/scheduler.cpp
index 0726410..3977bec 100644
--- a/mythtv/programs/mythbackend/scheduler.cpp
+++ b/mythtv/programs/mythbackend/scheduler.cpp
@@ -296,7 +296,11 @@ static bool comp_recstart(RecordingInfo *a, RecordingInfo *b)
return a->GetRecordingEndTime() < b->GetRecordingEndTime();
if (a->GetChannelSchedulingID() != b->GetChannelSchedulingID())
return a->GetChannelSchedulingID() < b->GetChannelSchedulingID();
- return a->GetRecordingStatus() < b->GetRecordingStatus();
+ if (a->GetRecordingStatus() != b->GetRecordingStatus())
+ return a->GetRecordingStatus() < b->GetRecordingStatus();
+ if (a->GetChanNum() != b->GetChanNum())
+ return a->GetChanNum() < b->GetChanNum();
+ return a->GetChanID() < b->GetChanID();
}
static bool comp_priority(RecordingInfo *a, RecordingInfo *b)