From f34d0bb615ffffbed4f29a9844a8d46310a7106d Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Tue, 22 Nov 2011 11:32:57 +0000
Subject: [PATCH] Return menu result, to close all menus

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


Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/c4c96b844dae09e38cbd4913d343331309d2a3d9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-11-22 (Tue, 22 Nov 2011)



------------------
This commit was generated by Migit
---
 src/gui/vfd_setup.cpp | 9 +++++----
 src/gui/vfd_setup.h   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/gui/vfd_setup.cpp b/src/gui/vfd_setup.cpp
index 3bc6c5ab5..f7bdc993c 100644
--- a/src/gui/vfd_setup.cpp
+++ b/src/gui/vfd_setup.cpp
@@ -77,9 +77,9 @@ int CVfdSetup::exec(CMenuTarget* parent, const std::string &actionKey)
 		return menu_return::RETURN_REPAINT;;
 	}
 
-	showSetup();
+	int res = showSetup();
 	
-	return menu_return::RETURN_REPAINT;	
+	return res;	
 }
 
 #define LCDMENU_STATUSLINE_OPTION_COUNT 2
@@ -106,7 +106,7 @@ const CMenuOptionChooser::keyval LCD_INFO_OPTIONS[LCD_INFO_OPTION_COUNT] =
 	{ 1, LOCALE_LCD_INFO_LINE_CLOCK }
 };
 
-void CVfdSetup::showSetup()
+int CVfdSetup::showSetup()
 {
 	CMenuWidget *vfds = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_LCD, width);
 	vfds->addIntroItems(LOCALE_LCDMENU_HEAD);
@@ -155,10 +155,11 @@ void CVfdSetup::showSetup()
 	vfds->addItem(oj);
 	vfds->addItem(lcd_clock_channelname_menu);
 	
-	vfds->exec(NULL, "");
+	int res = vfds->exec(NULL, "");
 	vfds->hide();
 	selected = vfds->getSelected();
 	delete vfds;
+	return res;
 }
 bool CVfdSetup::changeNotify(const neutrino_locale_t OptionName, void */* data */)
 {
diff --git a/src/gui/vfd_setup.h b/src/gui/vfd_setup.h
index aa7c28402..5316f6ee6 100644
--- a/src/gui/vfd_setup.h
+++ b/src/gui/vfd_setup.h
@@ -40,7 +40,7 @@
 	private:
 		int width, selected;
 
-		void showSetup();
+		int showSetup();
 		virtual bool changeNotify(const neutrino_locale_t OptionName, void *data);
 		int brightness;
 		int brightnessstandby;