diff options
| -rw-r--r-- | menu_search.c | 19 | ||||
| -rw-r--r-- | menu_searchactions.c | 11 |
2 files changed, 13 insertions, 17 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()) diff --git a/menu_searchactions.c b/menu_searchactions.c index 623fe5c..1d49d5c 100644 --- a/menu_searchactions.c +++ b/menu_searchactions.c @@ -74,7 +74,8 @@ cMenuSearchActions::~cMenuSearchActions() eOSState cMenuSearchActions::Search(void) { cMenuTemplate* MenuTemplate = NULL; - if (search && search->menuTemplate > 0) + if (!search) return osContinue; + if (search->menuTemplate > 0) MenuTemplate = cTemplFile::GetSearchTemplateByPos(search->menuTemplate); if (!MenuTemplate) MenuTemplate = cTemplFile::GetTemplateByName("MenuSearchResults"); @@ -124,11 +125,11 @@ eOSState cMenuSearchActions::Execute() updateForced = 3; // with message about completion return osBack; } - if (current == 3) + if (current == 3 && search) return AddSubMenu(new cMenuRecsDone(search)); - if (current == 4) + if (current == 4 && search) return AddSubMenu(new cMenuTimersDone(search)); - if (current == 5) + if (current == 5 && search) { if (!Interface->Confirm(tr("Copy this entry?"))) return osBack; @@ -142,7 +143,7 @@ eOSState cMenuSearchActions::Execute() SearchExts.Save(); return AddSubMenu(new cMenuEditSearchExt(copy)); } - if (current == 6) + if (current == 6 && search) { if (!Interface->Confirm(tr("Copy this entry to templates?"))) return osBack; |