mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 08:21:12 +02:00
Return menu result, to close all menus
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1876 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
@@ -71,13 +71,13 @@ int COsdLangSetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
|
||||
if(parent != NULL)
|
||||
parent->hide();
|
||||
|
||||
showLocalSetup();
|
||||
int res = showLocalSetup();
|
||||
|
||||
return menu_return::RETURN_REPAINT;
|
||||
return res;
|
||||
}
|
||||
|
||||
//show international settings menu
|
||||
void COsdLangSetup::showLocalSetup()
|
||||
int COsdLangSetup::showLocalSetup()
|
||||
{
|
||||
//main local setup
|
||||
CMenuWidget *localSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_LANGUAGE, width);
|
||||
@@ -105,10 +105,11 @@ void COsdLangSetup::showLocalSetup()
|
||||
localSettings->addItem(new CMenuForwarder(LOCALE_AUDIOMENU_PREF_LANGUAGES, true, NULL, prefMenu, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW));
|
||||
langNotifier->changeNotify(NONEXISTANT_LOCALE, NULL);
|
||||
|
||||
localSettings->exec(NULL, "");
|
||||
int res = localSettings->exec(NULL, "");
|
||||
localSettings->hide();
|
||||
selected = localSettings->getSelected();
|
||||
delete localSettings;
|
||||
return res;
|
||||
}
|
||||
|
||||
|
||||
@@ -263,7 +264,3 @@ bool CLangSelectNotifier::changeNotify(const neutrino_locale_t, void *)
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user