diff options
| author | Christian Wieninger <cwieninger@gmx.de> | 2012-04-06 20:27:04 +0200 |
|---|---|---|
| committer | Christian Wieninger <cwieninger@gmx.de> | 2012-04-06 20:27:04 +0200 |
| commit | 3bd2658c85f00269583259d5912c88f031b9599f (patch) | |
| tree | 6f95f40fbaf30b383a16f566d84a0ade7b448cec /menu_whatson.c | |
| parent | 65f1e5030f076c530a5a6a37ead43cf7d9d86325 (diff) | |
| download | vdr-plugin-epgsearch-3bd2658c85f00269583259d5912c88f031b9599f.tar.gz vdr-plugin-epgsearch-3bd2658c85f00269583259d5912c88f031b9599f.tar.bz2 | |
bugtracker #929, bunch of warning fixes, thanks to Joe_D for providing this patch
Diffstat (limited to 'menu_whatson.c')
| -rw-r--r-- | menu_whatson.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/menu_whatson.c b/menu_whatson.c index 45e8e63..24a520e 100644 --- a/menu_whatson.c +++ b/menu_whatson.c @@ -749,7 +749,7 @@ eOSState cMenuWhatsOnSearch::ProcessKey(eKeys Key) else { cMenuMyScheduleItem *mi = (cMenuMyScheduleItem *)Get(Current()); - if (mi) { + if (mi && mi->Selectable()) { if (mi->event) return AddSubMenu(new cMenuSearchCommands(tr("EPG Commands"),mi->event)); else @@ -774,7 +774,7 @@ eOSState cMenuWhatsOnSearch::ProcessKey(eKeys Key) if (toggleKeys == 0 || (toggleKeys == 1 && EPGSearchConfig.toggleGreenYellow == 0)) { cMenuMyScheduleItem *mi = (cMenuMyScheduleItem *)Get(Current()); - if (mi && mi->channel) + if (mi && mi->Selectable() && mi->channel) { const cSchedule *Schedule = schedules->GetSchedule(mi->channel); if (Schedule) @@ -809,7 +809,7 @@ eOSState cMenuWhatsOnSearch::ProcessKey(eKeys Key) else currentShowMode = GetNextMode(); cMenuMyScheduleItem *mi = (cMenuMyScheduleItem *)Get(Current()); - if (mi) + if (mi && mi->Selectable()) { currentChannel = mi->channel->Number(); scheduleChannel = Channels.GetByNumber(currentChannel); @@ -833,10 +833,13 @@ eOSState cMenuWhatsOnSearch::ProcessKey(eKeys Key) case kOk: { cMenuMyScheduleItem *mi = (cMenuMyScheduleItem *)Get(Current()); - if (!mi->event) // no EPG, so simply switch to channel - return Switch(); - else - return EPGSearchConfig.useOkForSwitch?Switch():ShowSummary(); + if (mi && mi->Selectable()) + { + if (!mi->event) // no EPG, so simply switch to channel + return Switch(); + else + return EPGSearchConfig.useOkForSwitch?Switch():ShowSummary(); + } } break; case kInfo: |