diff --git a/src/gui/info_menue.cpp b/src/gui/info_menue.cpp index bf76991a4..04ecae070 100644 --- a/src/gui/info_menue.cpp +++ b/src/gui/info_menue.cpp @@ -40,14 +40,12 @@ #include - CInfoMenu::CInfoMenu() { width = w_max (40, 10); selected = -1; } - CInfoMenu::~CInfoMenu() { @@ -62,14 +60,12 @@ int CInfoMenu::exec(CMenuTarget* parent, const std::string &/*actionKey*/) if (parent != NULL) parent->hide(); - showMenu(); + res = showMenu(); return res; } - - -void CInfoMenu::showMenu() +int CInfoMenu::showMenu() { printf("[neutrino] CInfoMenu call %s...\n", __FUNCTION__); @@ -81,11 +77,10 @@ void CInfoMenu::showMenu() info->addItem(new CMenuForwarder(LOCALE_EXTRA_DBOXINFO, true, NULL, new CDBoxInfoWidget, NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); info->addItem(new CMenuForwarder(LOCALE_STREAMINFO_HEAD, true, NULL, new CStreamInfo2(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW)); - info->exec(NULL, ""); + int res = info->exec(NULL, ""); info->hide(); selected = info->getSelected(); delete info; + return res; } - - diff --git a/src/gui/info_menue.h b/src/gui/info_menue.h index 597e58be5..e530d112a 100644 --- a/src/gui/info_menue.h +++ b/src/gui/info_menue.h @@ -40,7 +40,7 @@ class CInfoMenu : public CMenuTarget private: int width, selected; - void showMenu(); + int showMenu(); public: CInfoMenu();