diff options
| author | Christian Wieninger <cwieninger@gmx.de> | 2010-03-13 20:02:32 +0100 |
|---|---|---|
| committer | Christian Wieninger <cwieninger@gmx.de> | 2010-03-13 20:02:32 +0100 |
| commit | 27e5894e317354c9e3073fd07a280770d39c534b (patch) | |
| tree | e033f3e1c7e21a59ddc1f2d4c5469d9e2dfd2ae0 /menu_search.c | |
| parent | a9a6ba970b574bfd62279f5cc32d9a7d50bf5be1 (diff) | |
| download | vdr-plugin-epgsearch-27e5894e317354c9e3073fd07a280770d39c534b.tar.gz vdr-plugin-epgsearch-27e5894e317354c9e3073fd07a280770d39c534b.tar.bz2 | |
allow calling the actions menu without selecting a search entry
Diffstat (limited to 'menu_search.c')
| -rw-r--r-- | menu_search.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/menu_search.c b/menu_search.c index 517dc67..a47a3e3 100644 --- a/menu_search.c +++ b/menu_search.c @@ -179,14 +179,12 @@ eOSState cMenuEPGSearchExt::Actions(eKeys Key) if (HasSubMenu() || Count() == 0) return osContinue; cSearchExt* search = CurrentSearchExt(); - if (search) { - cMenuSearchActions *menu; - eOSState state = AddSubMenu(menu = new cMenuSearchActions(search, true)); - if (Key != kNone) - state = menu->ProcessKey(Key); - return state; - } - return osContinue; + + cMenuSearchActions *menu; + eOSState state = AddSubMenu(menu = new cMenuSearchActions(search, true)); + if (Key != kNone) + state = menu->ProcessKey(Key); + return state; } @@ -211,10 +209,7 @@ eOSState cMenuEPGSearchExt::ProcessKey(eKeys Key) case kBlue: if (HasSubMenu()) return osContinue; - if (CurrentSearchExt()) - state = AddSubMenu(new cMenuSearchActions(CurrentSearchExt())); - else - state = osContinue; + state = AddSubMenu(new cMenuSearchActions(CurrentSearchExt())); break; case kRed: if (HasSubMenu()) |