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

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


Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/7e7e7e218f948b7c4318eff55c052cf43758ab10
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2011-11-22 (Tue, 22 Nov 2011)
---
 src/gui/audio_setup.cpp | 7 ++++---
 src/gui/audio_setup.h   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/gui/audio_setup.cpp b/src/gui/audio_setup.cpp
index e1604146e..27f290c40 100644
--- a/src/gui/audio_setup.cpp
+++ b/src/gui/audio_setup.cpp
@@ -74,7 +74,7 @@ int CAudioSetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/)
 		parent->hide();
 	}
 
-	showAudioSetup();
+	res = showAudioSetup();
 	
 	return res;
 }
@@ -111,7 +111,7 @@ const CMenuOptionChooser::keyval AUDIOMENU_AVSYNC_OPTIONS[AUDIOMENU_AVSYNC_OPTIO
 // };
 
 /* audio settings menu */
-void CAudioSetup::showAudioSetup()
+int CAudioSetup::showAudioSetup()
 {
 	//menue init
 	CMenuWidget* audioSettings = new CMenuWidget(LOCALE_MAINSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width);
@@ -182,10 +182,11 @@ void CAudioSetup::showAudioSetup()
 	audioSettings->addItem(mf);
 #endif
 	
-	audioSettings->exec(NULL, "");
+	int res = audioSettings->exec(NULL, "");
 	audioSettings->hide();
 	selected = audioSettings->getSelected();
 	delete audioSettings;
+	return res;
 }
 
 //sets menu mode to "wizard" or "default"
diff --git a/src/gui/audio_setup.h b/src/gui/audio_setup.h
index fab5bd139..603643c20 100644
--- a/src/gui/audio_setup.h
+++ b/src/gui/audio_setup.h
@@ -41,7 +41,7 @@ class CAudioSetup : public CMenuTarget
 		int width, selected;
 		bool is_wizard;
 		
-		void showAudioSetup();
+		int showAudioSetup();
 
 	public:	
 		enum AUDIO_SETUP_MODE