diff options
-rw-r--r-- | epggrid.c | 6 | ||||
-rw-r--r-- | recmenumanager.c | 4 |
2 files changed, 9 insertions, 1 deletions
@@ -145,12 +145,16 @@ void cEpgGrid::drawText() { drawIcon("Switch", theme.Color(clrButtonYellow));
if (hasTimer) {
const cTimer *timer = NULL;
+#if VDRVERSNUM >= 20301
{
LOCK_TIMERS_READ;
timer = Timers->GetMatch(event);
}
+#else
+ timer = Timers.GetMatch(event);
+#endif
if (timer)
-#ifdef USE_SWITCHONLY
+#ifdef SWITCHONLYPATCH
if (timer->HasFlags(tfSwitchOnly))
drawIcon("Switch", theme.Color(clrButtonYellow));
else if (timer->HasFlags(tfActive))
diff --git a/recmenumanager.c b/recmenumanager.c index ccf6540..4c5d5ce 100644 --- a/recmenumanager.c +++ b/recmenumanager.c @@ -764,10 +764,14 @@ eOSState cRecMenuManager::StateMachine(eRecMenuState nextState) { if (cRecMenuEditTimer *menu = dynamic_cast<cRecMenuEditTimer*>(activeMenu)) {
timer = menu->GetOriginalTimer();
} else break;
+#if VDRVERSNUM >= 20301
{
LOCK_TIMERS_WRITE;
recManager->DeleteTimer(Timers->GetTimer(timer));
}
+#else
+ recManager->DeleteTimer(Timers.GetTimer(timer));
+#endif
delete activeMenu;
if (timerConflicts) {
delete timerConflicts;
|