Return menu result, to close all menus

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1879 e54a6e83-5905-42d5-8d5c-058d10e6a962
This commit is contained in:
focus
2011-11-22 11:46:22 +00:00
parent 8dceacd2a7
commit d4eb80abec
8 changed files with 20 additions and 19 deletions

View File

@@ -82,7 +82,7 @@ int CAudioPlayerSetup::exec(CMenuTarget* parent, const std::string &actionKey)
return res;
}
showAudioPlayerSetup();
res = showAudioPlayerSetup();
return res;
}
@@ -97,7 +97,7 @@ const CMenuOptionChooser::keyval AUDIOPLAYER_DISPLAY_ORDER_OPTIONS[AUDIOPLAYER_D
/*shows the audio setup menue*/
void CAudioPlayerSetup::showAudioPlayerSetup()
int CAudioPlayerSetup::showAudioPlayerSetup()
{
CMenuWidget* audioplayerSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
audioplayerSetup->setSelected(selected);
@@ -120,8 +120,9 @@ void CAudioPlayerSetup::showAudioPlayerSetup()
audioplayerSetup->addItem(new CMenuForwarder(LOCALE_AUDIOPLAYER_DEFDIR, true, g_settings.network_nfs_audioplayerdir, this, "audioplayerdir"));
audioplayerSetup->addItem(new CMenuOptionChooser(LOCALE_AUDIOPLAYER_ENABLE_SC_METADATA, &g_settings.audioplayer_enable_sc_metadata, MESSAGEBOX_NO_YES_OPTIONS, MESSAGEBOX_NO_YES_OPTION_COUNT, true ));
audioplayerSetup->exec (NULL, "");
int res = audioplayerSetup->exec (NULL, "");
audioplayerSetup->hide ();
selected = audioplayerSetup->getSelected();
delete audioplayerSetup;
return res;
}