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

Eliminate a "invalid lock sequence report" in tvguideosd.c

This commit is contained in:
kamel5 2019-04-23 13:44:44 +02:00
parent e7753834bc
commit 5df21a4707
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tvguideosd.c
View File

@ -238,13 +238,16 @@ void cTvGuideOsd::channelForward() {
bool colAdded = false; bool colAdded = false;
if (!colRight) { if (!colRight) {
const cChannel *channelRight = activeGrid->column->getChannel(); const cChannel *channelRight = activeGrid->column->getChannel();
const cChannels *channels;
#if VDRVERSNUM >= 20301 #if VDRVERSNUM >= 20301
{ {
LOCK_CHANNELS_READ; LOCK_CHANNELS_READ;
while (channelRight = Channels->Next(channelRight)) { channels = Channels;
}
#else #else
while (channelRight = Channels.Next(channelRight)) { channels = &Channels;
#endif #endif
while (channelRight = channels->Next(channelRight)) {
if (!channelRight->GroupSep()) { if (!channelRight->GroupSep()) {
if (channelGroups->IsInLastGroup(channelRight)) { if (channelGroups->IsInLastGroup(channelRight)) {
break; break;
@ -258,9 +261,6 @@ void cTvGuideOsd::channelForward() {
} }
} }
} }
#if VDRVERSNUM >= 20301
} //LOCK_CHANNELS_READ
#endif
if (colRight) { if (colRight) {
colAdded = true; colAdded = true;
if (columns.Count() == tvguideConfig.numGrids) { if (columns.Count() == tvguideConfig.numGrids) {
@ -297,13 +297,16 @@ void cTvGuideOsd::channelBack() {
bool colAdded = false; bool colAdded = false;
if (!colLeft) { if (!colLeft) {
const cChannel *channelLeft = activeGrid->column->getChannel(); const cChannel *channelLeft = activeGrid->column->getChannel();
const cChannels *channels;
#if VDRVERSNUM >= 20301 #if VDRVERSNUM >= 20301
{ {
LOCK_CHANNELS_READ; LOCK_CHANNELS_READ;
while (channelLeft = Channels->Prev(channelLeft)) { channels = Channels;
}
#else #else
while (channelLeft = Channels.Prev(channelLeft)) { channels = &Channels;
#endif #endif
while (channelLeft = channels->Prev(channelLeft)) {
if (!channelLeft->GroupSep()) { if (!channelLeft->GroupSep()) {
colLeft = new cChannelColumn(0, channelLeft, myTime); colLeft = new cChannelColumn(0, channelLeft, myTime);
if (colLeft->readGrids()) { if (colLeft->readGrids()) {
@ -314,9 +317,6 @@ void cTvGuideOsd::channelBack() {
} }
} }
} }
#if VDRVERSNUM >= 20301
} //LOCK_CHANNELS_READ
#endif
if (colLeft) { if (colLeft) {
colAdded = true; colAdded = true;
if (columns.Count() == tvguideConfig.numGrids) { if (columns.Count() == tvguideConfig.numGrids) {