diff options
| -rw-r--r-- | tvguidengosd.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/tvguidengosd.c b/tvguidengosd.c index bdb7f36..2f635bf 100644 --- a/tvguidengosd.c +++ b/tvguidengosd.c @@ -53,11 +53,14 @@ void cTVGuideOSD::Show(void) { timeManager->Now(); epgGrid = new cEpgGrid(rootView, timeManager); + const cChannel *startChannel; #if defined (APIVERSNUM) && (APIVERSNUM >= 20301) + { LOCK_CHANNELS_READ; - const cChannel *startChannel = Channels->GetByNumber(cDevice::CurrentChannel()); + startChannel = Channels->GetByNumber(cDevice::CurrentChannel()); + } #else - const cChannel *startChannel = Channels.GetByNumber(cDevice::CurrentChannel()); + startChannel = Channels.GetByNumber(cDevice::CurrentChannel()); #endif epgGrid->Init(startChannel); epgGrid->Activate(); @@ -342,11 +345,14 @@ void cTVGuideOSD::CheckTimeout(void) { int newChannelNum = channelJumper->GetChannel(); delete channelJumper; channelJumper = NULL; + const cChannels* channels; #if defined (APIVERSNUM) && (APIVERSNUM >= 20301) - LOCK_CHANNELS_READ; - const cChannels* channels = Channels; + { + LOCK_CHANNELS_READ; + channels = Channels; + } #else - cChannels* channels = &Channels; + channels = &Channels; #endif const cChannel *newChannel = channels->GetByNumber(newChannelNum); if (!newChannel) { |