Permalink
Browse files

Minor update to 8b9c595.

Re-fix the scheduler ordering in the very rare case where a program is
being recorded multiple times on the same channel.
  • Loading branch information...
1 parent 8b9c595 commit 20abad4445c800d7152cd01e035ae8e65e4bfc47 @gigem gigem committed Aug 16, 2011
Showing with 5 additions and 1 deletion.
  1. +5 −1 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)

0 comments on commit 20abad4

Please sign in to comment.