mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Return menu result, to close all menus

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: d4eb80abec
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:46:22 +00:00
parent 7238d16e0f
commit c32d1c731d
8 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/miscsettings_menu.cpp
View File

@@ -117,9 +117,7 @@ int CMiscMenue::exec(CMenuTarget* parent, const std::string &actionKey)
}
#endif /*ONE_KEY_PLUGIN*/
showMiscSettingsMenu();
return menu_return::RETURN_REPAINT;
return showMiscSettingsMenu();
}
@@ -160,7 +158,7 @@ const CMenuOptionChooser::keyval_ext CPU_FREQ_OPTIONS[CPU_FREQ_OPTION_COUNT] =
#endif /*CPU_FREQ*/
//show misc settings menue
void CMiscMenue::showMiscSettingsMenu()
int CMiscMenue::showMiscSettingsMenu()
{
//misc settings
fanNotifier = new CFanControlNotifier();
@@ -212,11 +210,12 @@ void CMiscMenue::showMiscSettingsMenu()
misc_menue->addItem( new CMenuForwarderNonLocalized("CPU", true, NULL, misc_menue_cpu, NULL, CRCInput::RC_4));
#endif /*CPU_FREQ*/
misc_menue->exec(NULL, "");
int res = misc_menue->exec(NULL, "");
misc_menue->hide();
selected = misc_menue->getSelected();
delete fanNotifier;
delete misc_menue;
return res;
}
//general settings