Changes for locking in cChannelColumn::SetTimers()

2018-05-04 11:36:06 +02:00 · 2018-05-04 11:36:06 +02:00 · b086cf85dc
parent b054fa2c12
commit b086cf85dc
2 changed files with 5 additions and 1 deletions
--- a/channelcolumn.c
+++ b/channelcolumn.c
@ -386,12 +386,14 @@ void cChannelColumn::SetTimers() {
 #if VDRVERSNUM >= 20301
    hasTimer = false;
    const cSchedule *Schedule = NULL;
+    {
    LOCK_SCHEDULES_READ;
    const cSchedules* schedules = Schedules;
    if (schedules) {
        Schedule = schedules->GetSchedule(channel);
        hasTimer = Schedule ? Schedule->HasTimer() : false;
        }
+    }
 #else
    hasTimer = channel->HasTimer();
 #endif
--- a/epggrid.c
+++ b/epggrid.c
@ -155,8 +155,10 @@ void cEpgGrid::drawText() {
        drawIcon("Switch", theme.Color(clrButtonYellow));
    if (hasTimer) {
        const cTimer *timer = NULL;
+        {
        LOCK_TIMERS_READ;
        timer = Timers->GetMatch(event);
+        }
 	if (timer)
 #ifdef USE_SWITCHONLY
           if (timer->HasFlags(tfSwitchOnly))