diff options
| author | kamel5 <vdr.kamel5 (at) gmx (dot) net> | 2019-04-23 13:44:44 +0200 |
|---|---|---|
| committer | kamel5 <vdr.kamel5 (at) gmx (dot) net> | 2019-04-23 13:44:44 +0200 |
| commit | 5df21a470756bc5deb50b319b4f0902e4d20c090 (patch) | |
| tree | 1594942c3b7756a9cf3058b5963ec0de0f2ac398 | |
| parent | e7753834bc950470fd0cd9db80daccac420fee5b (diff) | |
| download | vdr-plugin-tvguide-5df21a470756bc5deb50b319b4f0902e4d20c090.tar.gz vdr-plugin-tvguide-5df21a470756bc5deb50b319b4f0902e4d20c090.tar.bz2 | |
Eliminate a "invalid lock sequence report" in tvguideosd.c
| -rw-r--r-- | tvguideosd.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tvguideosd.c b/tvguideosd.c index bd3b812..042e8da 100644 --- a/tvguideosd.c +++ b/tvguideosd.c @@ -238,13 +238,16 @@ void cTvGuideOsd::channelForward() { bool colAdded = false;
if (!colRight) {
const cChannel *channelRight = activeGrid->column->getChannel();
+ const cChannels *channels;
#if VDRVERSNUM >= 20301
- {
+ {
LOCK_CHANNELS_READ;
- while (channelRight = Channels->Next(channelRight)) {
+ channels = Channels;
+ }
#else
- while (channelRight = Channels.Next(channelRight)) {
+ channels = &Channels;
#endif
+ while (channelRight = channels->Next(channelRight)) {
if (!channelRight->GroupSep()) {
if (channelGroups->IsInLastGroup(channelRight)) {
break;
@@ -258,9 +261,6 @@ void cTvGuideOsd::channelForward() { }
}
}
-#if VDRVERSNUM >= 20301
- } //LOCK_CHANNELS_READ
-#endif
if (colRight) {
colAdded = true;
if (columns.Count() == tvguideConfig.numGrids) {
@@ -297,13 +297,16 @@ void cTvGuideOsd::channelBack() { bool colAdded = false;
if (!colLeft) {
const cChannel *channelLeft = activeGrid->column->getChannel();
+ const cChannels *channels;
#if VDRVERSNUM >= 20301
{
LOCK_CHANNELS_READ;
- while (channelLeft = Channels->Prev(channelLeft)) {
+ channels = Channels;
+ }
#else
- while (channelLeft = Channels.Prev(channelLeft)) {
+ channels = &Channels;
#endif
+ while (channelLeft = channels->Prev(channelLeft)) {
if (!channelLeft->GroupSep()) {
colLeft = new cChannelColumn(0, channelLeft, myTime);
if (colLeft->readGrids()) {
@@ -314,9 +317,6 @@ void cTvGuideOsd::channelBack() { }
}
}
-#if VDRVERSNUM >= 20301
- } //LOCK_CHANNELS_READ
-#endif
if (colLeft) {
colAdded = true;
if (columns.Count() == tvguideConfig.numGrids) {
|