Return menu result, to close all menus

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1877 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: c4c96b844d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-11-22 (Tue, 22 Nov 2011)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2011-11-22 11:32:57 +00:00
parent f147019b5b
commit f34d0bb615
2 changed files with 6 additions and 5 deletions

View File

@@ -77,9 +77,9 @@ int CVfdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
return menu_return::RETURN_REPAINT;;
}
showSetup();
int res = showSetup();
return menu_return::RETURN_REPAINT;
return res;
}
#define LCDMENU_STATUSLINE_OPTION_COUNT 2
@@ -106,7 +106,7 @@ const CMenuOptionChooser::keyval LCD_INFO_OPTIONS[LCD_INFO_OPTION_COUNT] =
{ 1, LOCALE_LCD_INFO_LINE_CLOCK }
};
void CVfdSetup::showSetup()
int CVfdSetup::showSetup()
{
CMenuWidget *vfds = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_LCD, width);
vfds->addIntroItems(LOCALE_LCDMENU_HEAD);
@@ -155,10 +155,11 @@ void CVfdSetup::showSetup()
vfds->addItem(oj);
vfds->addItem(lcd_clock_channelname_menu);
vfds->exec(NULL, "");
int res = vfds->exec(NULL, "");
vfds->hide();
selected = vfds->getSelected();
delete vfds;
return res;
}
bool CVfdSetup::changeNotify(const neutrino_locale_t OptionName, void */* data */)
{