summaryrefslogtreecommitdiff
path: root/channelepg.c
diff options
context:
space:
mode:
authorkamel5 <vdr.kamel5 (at) gmx (dot) net>2019-07-05 16:24:04 +0200
committerkamel5 <vdr.kamel5 (at) gmx (dot) net>2019-07-05 16:44:38 +0200
commite96911dfac925247c4f70e50fa96c4741ab01e67 (patch)
tree5565bf422b826981b75e9a86fa7814e625759211 /channelepg.c
parentebd63f9a42ebf2024f326ff506c009d13446bca5 (diff)
downloadvdr-plugin-tvguideng-e96911dfac925247c4f70e50fa96c4741ab01e67.tar.gz
vdr-plugin-tvguideng-e96911dfac925247c4f70e50fa96c4741ab01e67.tar.bz2
Fixed invalid lock sequence reports
Diffstat (limited to 'channelepg.c')
-rw-r--r--channelepg.c21
1 files changed, 15 insertions, 6 deletions
diff --git a/channelepg.c b/channelepg.c
index 3ca9173..b5af13c 100644
--- a/channelepg.c
+++ b/channelepg.c
@@ -22,12 +22,15 @@ bool cChannelEpg::ReadGrids(void) {
const cSchedule *Schedule = NULL;
+ const cSchedules* schedules;
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+ {
LOCK_SCHEDULES_READ;
- const cSchedules* schedules = Schedules;
+ schedules = Schedules;
+ }
#else
cSchedulesLock schedulesLock;
- const cSchedules* schedules = (cSchedules*)cSchedules::Schedules(schedulesLock);
+ schedules = (cSchedules*)cSchedules::Schedules(schedulesLock);
#endif
if (!schedules)
return false;
@@ -171,12 +174,15 @@ void cChannelEpg::AddNewGridsAtStart(void) {
return;
}
//if not, i have to add new ones to the list
+ const cSchedules* schedules;
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+ {
LOCK_SCHEDULES_READ;
- const cSchedules* schedules = Schedules;
+ schedules = Schedules;
+ }
#else
cSchedulesLock schedulesLock;
- const cSchedules* schedules = (cSchedules*)cSchedules::Schedules(schedulesLock);
+ schedules = (cSchedules*)cSchedules::Schedules(schedulesLock);
#endif
if (!schedules)
return ;
@@ -225,12 +231,15 @@ void cChannelEpg::AddNewGridsAtEnd(void) {
return;
}
//if not, i have to add new ones to the list
+ const cSchedules* schedules;
#if defined (APIVERSNUM) && (APIVERSNUM >= 20301)
+ {
LOCK_SCHEDULES_READ;
- const cSchedules* schedules = Schedules;
+ schedules = Schedules;
+ }
#else
cSchedulesLock schedulesLock;
- const cSchedules* schedules = (cSchedules*)cSchedules::Schedules(schedulesLock);
+ schedules = (cSchedules*)cSchedules::Schedules(schedulesLock);
#endif
if (!schedules)
return ;