diff --git a/src/gui/settings_manager.cpp b/src/gui/settings_manager.cpp index 93e040981..96bf464bd 100644 --- a/src/gui/settings_manager.cpp +++ b/src/gui/settings_manager.cpp @@ -138,14 +138,12 @@ int CSettingsManager::exec(CMenuTarget* parent, const std::string &actionKey) return res; } - showMenu(); + res = showMenu(); return res; } - - -void CSettingsManager::showMenu() +int CSettingsManager::showMenu() { printf("[neutrino] CSettingsManager call %s...\n", __FUNCTION__); @@ -166,13 +164,10 @@ void CSettingsManager::showMenu() mset->addItem(GenericMenuSeparatorLine); mset->addItem(new CMenuForwarder(LOCALE_RESET_ALL, true, NULL, resetNotifier, "all", CRCInput::RC_standby, NEUTRINO_ICON_BUTTON_POWER)); - mset->exec(NULL, ""); + int res = mset->exec(NULL, ""); mset->hide(); selected = mset->getSelected(); delete resetNotifier; delete mset; - + return res; } - - - diff --git a/src/gui/settings_manager.h b/src/gui/settings_manager.h index 73de6438e..d6940668a 100644 --- a/src/gui/settings_manager.h +++ b/src/gui/settings_manager.h @@ -40,7 +40,7 @@ class CSettingsManager : public CMenuTarget private: int width, selected; - void showMenu(); + int showMenu(); public: CSettingsManager(); diff --git a/src/neutrino.h b/src/neutrino.h index 8c4e50356..bc12b68bd 100644 --- a/src/neutrino.h +++ b/src/neutrino.h @@ -165,7 +165,6 @@ private: void SetupFrameBuffer(); void CmdParser(int argc, char **argv); - void saveColors(const char * fname); CNeutrinoApp(); public: