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

@@ -81,7 +81,7 @@ int CPictureViewerSetup::exec(CMenuTarget* parent, const std::string &actionKey)
return res;
}
showPictureViewerSetup();
res = showPictureViewerSetup();
return res;
}
@@ -97,7 +97,7 @@ const CMenuOptionChooser::keyval PICTUREVIEWER_SCALING_OPTIONS[PICTUREVIEWER_SCA
/*shows the picviewer setup menue*/
void CPictureViewerSetup::showPictureViewerSetup()
int CPictureViewerSetup::showPictureViewerSetup()
{
CMenuWidget* picviewsetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
@@ -111,8 +111,9 @@ void CPictureViewerSetup::showPictureViewerSetup()
picviewsetup->addItem(new CMenuForwarder(LOCALE_PICTUREVIEWER_SLIDE_TIME, true, g_settings.picviewer_slide_time, pic_timeout));
picviewsetup->addItem(new CMenuForwarder(LOCALE_PICTUREVIEWER_DEFDIR, true, g_settings.network_nfs_picturedir, this, "picturedir"));
picviewsetup->exec(NULL, "");
int res = picviewsetup->exec(NULL, "");
picviewsetup->hide();
selected = picviewsetup->getSelected();
delete picviewsetup;
return res;
}