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

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

diff --git a/src/gui/themes.cpp b/src/gui/themes.cpp
index 6f9703b0d..677b8c765 100644
--- a/src/gui/themes.cpp
+++ b/src/gui/themes.cpp
@@ -62,7 +62,6 @@ CThemes::CThemes()
 int CThemes::exec(CMenuTarget* parent, const std::string & actionKey)
 {
 	int res = menu_return::RETURN_REPAINT;
-	
 
 	if( !actionKey.empty() )
 	{
@@ -94,8 +93,7 @@ int CThemes::exec(CMenuTarget* parent, const std::string & actionKey)
 	if ( !hasThemeChanged )
 		rememberOldTheme( true );
 
-	Show();
-	return res;
+	return Show();
 }
 
 void CThemes::readThemes(CMenuWidget &themes)
@@ -142,7 +140,7 @@ void CThemes::readThemes(CMenuWidget &themes)
 	}
 }
 
-void CThemes::Show()
+int CThemes::Show()
 {
 	std::string file_name = "";
 
@@ -174,7 +172,7 @@ void CThemes::Show()
 		printf("[neutrino theme] error accessing %s\n", USERDIR);
 	}
 
-	themes.exec(NULL, "");
+	int res = themes.exec(NULL, "");
 	themes.hide();
 
 	if (file_name.length() > 1) {
@@ -187,6 +185,7 @@ void CThemes::Show()
 		else
 			hasThemeChanged = false;
 	}
+	return res;
 }
 
 void CThemes::rememberOldTheme(bool remember)
diff --git a/src/gui/themes.h b/src/gui/themes.h
index 3164e4f52..39d6bff8b 100644
--- a/src/gui/themes.h
+++ b/src/gui/themes.h
@@ -39,7 +39,7 @@ class CThemes : public CMenuTarget, CChangeObserver
 
 		bool hasThemeChanged;
 
-		void Show();
+		int Show();
 		void readFile(char* themename);
 		void saveFile(char* themename);
 		void readThemes(CMenuWidget &);