diff options
Diffstat (limited to 'timerconflict.c')
| -rw-r--r-- | timerconflict.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/timerconflict.c b/timerconflict.c index 2aaef7a..4fcf605 100644 --- a/timerconflict.c +++ b/timerconflict.c @@ -84,11 +84,13 @@ void cTVGuideTimerConflicts::CalculateConflicts(void) { #if VDRVERSNUM >= 20301 LOCK_TIMERS_READ; const cTimers* timers = Timers; + for (int j=0; j < numTimers; j++) { + const cTimer *timer = timers->GetById(conflicts[i]->timerIDs[j] + 1); #else const cTimers* timers = &Timers; -#endif for (int j=0; j < numTimers; j++) { - const cTimer *timer = timers->GetById(conflicts[i]->timerIDs[j] + 1); + const cTimer *timer = timers->Get(conflicts[i]->timerIDs[j]); +#endif if (timer) { if (!unionSet) { unionSet = new cTimeInterval(timer->StartTime(), timer->StopTime()); @@ -107,7 +109,11 @@ void cTVGuideTimerConflicts::CalculateConflicts(void) { cTimeInterval *intersect = NULL; for (int j=0; j < numTimers; j++) { +#if VDRVERSNUM >= 20301 const cTimer *timer = timers->GetById(conflicts[i]->timerIDs[j] + 1); +#else + const cTimer *timer = timers->Get(conflicts[i]->timerIDs[j]); +#endif if (timer) { if (!intersect) { intersect = new cTimeInterval(timer->StartTime(), timer->StopTime()); |