diff options
| author | Jasmin Jessich <jasmin@anw.at> | 2017-05-25 20:44:06 +0200 |
|---|---|---|
| committer | Jasmin Jessich <jasmin@anw.at> | 2017-05-25 20:44:06 +0200 |
| commit | 3e0774c0968dc38178cadb41558302c8a888b875 (patch) | |
| tree | 3bd4cadc1b0f5127b54112b153b0a579b4195436 /pages/timers.ecpp | |
| parent | 6c7dc2d68ffd8a2097531e3acfee588a27710586 (diff) | |
| download | vdr-plugin-live-3e0774c0968dc38178cadb41558302c8a888b875.tar.gz vdr-plugin-live-3e0774c0968dc38178cadb41558302c8a888b875.tar.bz2 | |
Fixed lock order in several files
- It is still not finished, but most of the locks should be in the right
order now.
I am still waiting for a VDR patch to check the lock order dynamically.
Diffstat (limited to 'pages/timers.ecpp')
| -rw-r--r-- | pages/timers.ecpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/pages/timers.ecpp b/pages/timers.ecpp index 771a907..ff3fd40 100644 --- a/pages/timers.ecpp +++ b/pages/timers.ecpp @@ -75,15 +75,14 @@ static const size_t maximumDescriptionLength = 300; <table class="listing" cellspacing="0" cellpadding="0"> <%cpp> // output of the timer list: -#if VDRVERSNUM >= 20301 - /* JJJ: Lock this inside the loop */ - LOCK_SCHEDULES_READ; -#endif for (SortedTimers::iterator timer = timers.begin(); timer != timers.end(); ++timer) { EpgInfoPtr epgEvent; string longDescription; #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 |