From 6160cf9291ece475e0862051417635a0a9177a25 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 29 Feb 2016 22:44:06 +0100 Subject: [PATCH] adzap: call adzap directly from usermenu Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/2b0996e3d3ade949a9a71962f44a47c2574cff40 Author: vanhofen Date: 2016-02-29 (Mon, 29 Feb 2016) Origin message was: ------------------ - adzap: call adzap directly from usermenu ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/user_menue.cpp | 2 +- src/neutrino.cpp | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index 511b0cf7b..925d95011 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -377,7 +377,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) break; case SNeutrinoSettings::ITEM_ADZAP: keyhelper.get(&key,&icon,CRCInput::RC_blue); - menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_ADZAP, true, adzap_active ? g_Locale->getText(LOCALE_OPTIONS_OFF) : NULL, neutrino, "adzap", key, icon); + menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_ADZAP, true, adzap_active ? g_Locale->getText(LOCALE_OPTIONS_OFF) : NULL, CAdZapMenu::getInstance(), "adzap", key, icon); menu_item->setHint(NEUTRINO_ICON_HINT_ADZAP, adzap_active ? LOCALE_MENU_HINT_ADZAP_ACTIVE : LOCALE_MENU_HINT_ADZAP); break; #if 0 diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 7239ff10c..9c9a54919 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -4003,13 +4003,6 @@ int CNeutrinoApp::exec(CMenuTarget* parent, const std::string & actionKey) exit(1); } } - else if(actionKey == "adzap") { - CAdZapMenu::getInstance()->exec(parent, "adzap"); - if (CAdZapMenu::getInstance()->isActive()) - return menu_return::RETURN_EXIT_ALL; - else - return menu_return::RETURN_REPAINT; - } else if(actionKey == "moviedir") { parent->hide();