From da0889afd4c30a04bdadcfae8a2c4de34b712573 Mon Sep 17 00:00:00 2001
From: thilo <thilo@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: Thu, 15 Dec 2011 08:22:30 +0000
Subject: [PATCH] *neutrino scan_setup: leave menue on menu key

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

diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp
index 6ced70069..e8170cda5 100644
--- a/src/gui/scan_setup.cpp
+++ b/src/gui/scan_setup.cpp
@@ -259,7 +259,7 @@ int CScanSetup::exec(CMenuTarget* parent, const std::string &actionKey)
 	
 	printf("[neutrino] CScanSetup %s: init scan setup (Mode: %d)...\n",__FUNCTION__ , is_wizard);
 	CZapit::getInstance()->GetConfig(zapitCfg);
-	showScanMenu();
+	res = showScanMenu();
 
 	return res;
 }
@@ -306,7 +306,7 @@ unsigned int CScanSetup::getSatMenuListWidth()
 	return max_txt_w;
 }
 
-void CScanSetup::showScanMenu()
+int CScanSetup::showScanMenu()
 {
 	printf("[neutrino] CScanSetup call %s...\n", __FUNCTION__);
 	int shortcut = 1;
@@ -449,13 +449,14 @@ void CScanSetup::showScanMenu()
 	}
 #endif /*ENABLE_FASTSCAN*/
 	
-	settings->exec(NULL, "");
+	int res = settings->exec(NULL, "");
 	settings->hide();
 	selected = settings->getSelected();
 	delete satNotify;
 	delete usalsNotify;
 	delete satSelect;
 	delete settings;
+	return res;
 }
 
 //init sat setup menu
diff --git a/src/gui/scan_setup.h b/src/gui/scan_setup.h
index 338206f19..e4a47b62d 100644
--- a/src/gui/scan_setup.h
+++ b/src/gui/scan_setup.h
@@ -68,7 +68,7 @@ class CScanSetup : public CMenuTarget
 		
 		uint getSatMenuListWidth();
 		
-		void showScanMenu();
+		int showScanMenu();
 		
 		void addScanMenuLnbSetup(CMenuWidget *sat_setup);
 		void addScanMenuProvider(CMenuWidget *provider_setup);