diff options
Diffstat (limited to 'recmenuview.c')
| -rw-r--r-- | recmenuview.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/recmenuview.c b/recmenuview.c index a7b1d62..1437ff4 100644 --- a/recmenuview.c +++ b/recmenuview.c @@ -234,7 +234,7 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) { LOCK_TIMERS_READ; const cTimer *t = Timers->Get(timerID); #else - cTimer *t = Timers.Get(timerID); + const cTimer *t = Timers.Get(timerID); #endif if (t) { const cEvent *ev = t->Event(); @@ -251,10 +251,19 @@ eOSState cRecMenuView::StateMachine(eRecMenuState nextState) { timerIndex = menu->GetTimerConflictIndex(); } else break; int timerID = timerConflicts->GetCurrentConflictTimerID(timerIndex); - recManager->DeleteTimer(timerID); + const cTimers* timers; +#if VDRVERSNUM >= 20301 + { + LOCK_TIMERS_READ; + timers = Timers; + } +#else + timers = &Timers; +#endif + recManager->DeleteTimer(timers->Get(timerID)->Event()); delete activeMenu; if (!DisplayTimerConflict(timerID)) { - activeMenu = new cRecMenuConfirmTimer(event); + activeMenu = new cRecMenuConfirmTimer(timers->Get(timerID)->Event()); activeMenu->Display(); } break; } |