frodovdr
/
vdr-plugin-tvguide
mirror of https://projects.vdr-developer.org/git/vdr-plugin-tvguide.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Changes for locking in cChannelColumn::SetTimers()

This commit is contained in:
kamel5 2018-05-04 11:36:06 +02:00 committed by kamel5
parent b054fa2c12
commit b086cf85dc
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channelcolumn.c
View File

@ -386,12 +386,14 @@ void cChannelColumn::SetTimers() {
#if VDRVERSNUM >= 20301 #if VDRVERSNUM >= 20301
hasTimer = false; hasTimer = false;
const cSchedule *Schedule = NULL; const cSchedule *Schedule = NULL;
{
LOCK_SCHEDULES_READ; LOCK_SCHEDULES_READ;
const cSchedules* schedules = Schedules; const cSchedules* schedules = Schedules;
if (schedules) { if (schedules) {
Schedule = schedules->GetSchedule(channel); Schedule = schedules->GetSchedule(channel);
hasTimer = Schedule ? Schedule->HasTimer() : false; hasTimer = Schedule ? Schedule->HasTimer() : false;
} }
}
#else #else
hasTimer = channel->HasTimer(); hasTimer = channel->HasTimer();
#endif #endif

2
epggrid.c
View File

@ -155,8 +155,10 @@ void cEpgGrid::drawText() {
drawIcon("Switch", theme.Color(clrButtonYellow)); drawIcon("Switch", theme.Color(clrButtonYellow));
if (hasTimer) { if (hasTimer) {
const cTimer *timer = NULL; const cTimer *timer = NULL;
{
LOCK_TIMERS_READ; LOCK_TIMERS_READ;
timer = Timers->GetMatch(event); timer = Timers->GetMatch(event);
}
if (timer) if (timer)
#ifdef USE_SWITCHONLY #ifdef USE_SWITCHONLY
if (timer->HasFlags(tfSwitchOnly)) if (timer->HasFlags(tfSwitchOnly))