diff options
Diffstat (limited to 'pages/timerconflicts.ecpp')
| -rw-r--r-- | pages/timerconflicts.ecpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pages/timerconflicts.ecpp b/pages/timerconflicts.ecpp index 61e7338..bbc35b6 100644 --- a/pages/timerconflicts.ecpp +++ b/pages/timerconflicts.ecpp @@ -44,11 +44,6 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); % } else { <table class="listing" cellspacing="0" cellpadding="0"> <%cpp> -#if VDRVERSNUM >= 20301 - /* JJJ: Lock this later when it is realy used */ - LOCK_TIMERS_READ; - LOCK_SCHEDULES_READ; -#endif for (TimerConflicts::iterator conflict = timerConflicts.begin(); conflict != timerConflicts.end(); ++conflict) { const std::list< TimerInConflict >& conflTimers = conflict->ConflictingTimers(); for (std::list< TimerInConflict >::const_iterator confltimer = conflTimers.begin(); confltimer != conflTimers.end(); ++confltimer) { @@ -73,6 +68,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); <%cpp> for (std::list<int>::const_iterator timerIndex = confltimer->concurrentTimerIndices.begin(); timerIndex != confltimer->concurrentTimerIndices.end(); ++timerIndex) { #if VDRVERSNUM >= 20301 + LOCK_TIMERS_READ; cTimer* timer = (cTimer *)Timers->Get(*timerIndex-1); #else cTimer* timer = Timers.Get(*timerIndex-1); @@ -94,11 +90,14 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); timerStateHint = tr("Timer is active."); } - EpgInfoPtr epgEvent; + EpgInfoPtr epgEvent; string longDescription; string title; #if VDRVERSNUM >= 20301 - if (!timer->Event()) timer->SetEventFromSchedule(Schedules); + if (!timer->Event()) { + LOCK_SCHEDULES_READ; + timer->SetEventFromSchedule(Schedules); + } #else if (!timer->Event()) timer->SetEventFromSchedule(); #endif |