diff options
| author | Frank Neumann <fnu@yavdr.org> | 2017-05-07 10:37:07 +0200 |
|---|---|---|
| committer | Frank Neumann <fnu@yavdr.org> | 2017-05-07 10:37:07 +0200 |
| commit | cf9d8e7257ef26b80d3998d4cdb12cd1e39d5e5c (patch) | |
| tree | 3e5367dd39a08388ab0b42ad808f55925b73fd76 /menu_event.c | |
| parent | 2ca34fc4df563da93183c525316b755e658a7432 (diff) | |
| download | vdr-plugin-epgsearch-cf9d8e7257ef26b80d3998d4cdb12cd1e39d5e5c.tar.gz vdr-plugin-epgsearch-cf9d8e7257ef26b80d3998d4cdb12cd1e39d5e5c.tar.bz2 | |
Commit 0002-fix-incorrect-lock-sequences.diff (thx TomJoad@vdr-portal.de)
Diffstat (limited to 'menu_event.c')
| -rw-r--r-- | menu_event.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/menu_event.c b/menu_event.c index 7c29114..d9c92f7 100644 --- a/menu_event.c +++ b/menu_event.c @@ -85,9 +85,12 @@ void cMenuEventSearch::Set() if (event) { #if VDRVERSNUM > 20300 + LOCK_TIMERS_READ; + const cTimers *vdrtimers = Timers; LOCK_CHANNELS_READ; const cChannels *vdrchannels = Channels; #else + cTimers *vdrtimers = &Timers; cChannels *vdrchannels = &Channels; #endif const cChannel *channel = vdrchannels->GetByChannelID(event->ChannelID(), true, true); @@ -102,12 +105,6 @@ void cMenuEventSearch::Set() cEventObj* eventObjNext = GetNext(event); eTimerMatch timerMatch = tmNone; -#if VDRVERSNUM > 20300 - LOCK_TIMERS_READ; - const cTimers *vdrtimers = Timers; -#else - cTimers *vdrtimers = &Timers; -#endif vdrtimers->GetMatch(event, &timerMatch); const char* szRed = trVDR("Button$Record"); if (timerMatch == tmFull) |