mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-28 16:01:10 +02:00
Return menu result, to close all menus
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1878 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 8dceacd2a7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-11-22 (Tue, 22 Nov 2011)
This commit is contained in:
@@ -91,12 +91,10 @@ int CUserMenuSetup::exec(CMenuTarget* parent, const std::string &)
|
||||
if(parent != NULL)
|
||||
parent->hide();
|
||||
|
||||
showSetup();
|
||||
|
||||
return menu_return::RETURN_REPAINT;
|
||||
return showSetup();
|
||||
}
|
||||
|
||||
void CUserMenuSetup::showSetup()
|
||||
int CUserMenuSetup::showSetup()
|
||||
{
|
||||
CMenuWidget * ums = new CMenuWidget(local, NEUTRINO_ICON_KEYBINDING, width);
|
||||
|
||||
@@ -120,9 +118,9 @@ void CUserMenuSetup::showSetup()
|
||||
ums->addItem( new CMenuOptionChooser(text, &g_settings.usermenu[button][item], USERMENU_ITEM_OPTIONS, USERMENU_ITEM_OPTION_COUNT,true ));
|
||||
}
|
||||
|
||||
ums->exec(NULL, "");
|
||||
int res = ums->exec(NULL, "");
|
||||
ums->hide();
|
||||
delete ums;
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user