From 5c0292e59c89eb7434e6d23b02a43ff991dc67cb Mon Sep 17 00:00:00 2001
From: focus <focus@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: Tue, 22 Nov 2011 11:10:26 +0000
Subject: [PATCH] Return menu result, to close all menus

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1873 e54a6e83-5905-42d5-8d5c-058d10e6a962
---
 src/gui/videosettings.cpp | 8 ++++----
 src/gui/videosettings.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gui/videosettings.cpp b/src/gui/videosettings.cpp
index 0fde876bd..2790b7fe3 100644
--- a/src/gui/videosettings.cpp
+++ b/src/gui/videosettings.cpp
@@ -89,8 +89,7 @@ int CVideoSettings::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
 		parent->hide();
 	}
 
-	showVideoSetup();
-
+	res = showVideoSetup();
 	
 	return res;
 }
@@ -178,7 +177,7 @@ const CMenuOptionChooser::keyval VIDEOMENU_DBDR_OPTIONS[VIDEOMENU_DBDR_OPTION_CO
 	{ 2, LOCALE_VIDEOMENU_DBDR_BOTH }
 };
 
-void CVideoSettings::showVideoSetup()
+int CVideoSettings::showVideoSetup()
 {
 	//init
 	CMenuWidget * videosetup = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width);
@@ -243,10 +242,11 @@ void CVideoSettings::showVideoSetup()
 	videosetup->addItem(vs_dbdropt_ch);	  //dbdr options
 	videosetup->addItem(vs_videomodes_fw);	  //video modes submenue
 
- 	videosetup->exec(NULL, "");
+ 	int res = videosetup->exec(NULL, "");
  	videosetup->hide();
 	selected = videosetup->getSelected();
  	delete videosetup;
+	return res;
 }
 
 
diff --git a/src/gui/videosettings.h b/src/gui/videosettings.h
index 801aac629..7cdeebfac 100644
--- a/src/gui/videosettings.h
+++ b/src/gui/videosettings.h
@@ -48,7 +48,7 @@ class CVideoSettings : public CMenuWidget, CChangeObserver
 		bool is_wizard;
 		
 		int width, selected;
-		void showVideoSetup();
+		int showVideoSetup();
 
 public:
 		enum VIDEO_SETUP_MODE