From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Thu, 19 Oct 2006 13:31:35 +0000 (+0000)
Subject: don't change language on pressing EXIT
X-Git-Tag: 2.6.0~2881
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/4e81b86a327fd71320b97413145a969f2071ee8e?hp=60c53dd7a61f52be0641ef1fbf5ee4a8bb5309ee

don't change language on pressing EXIT
---

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index e5be57ef..83d03403 100644
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -11,6 +11,8 @@ class LanguageSelection(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
 		
+		self.oldActiveLanguage = language.getActiveLanguage()
+		
 		self.list = []
 		self["list"] = LanguageList(self.list)
 		self.updateList()
@@ -19,7 +21,7 @@ class LanguageSelection(Screen):
 		self["actions"] = ActionMap(["OkCancelActions", "DirectionActions"], 
 		{
 			"ok": self.save,
-			"cancel": self.close,
+			"cancel": self.cancel,
 			"up": self.up,
 			"down": self.down,
 			"left": self.left,
@@ -39,6 +41,10 @@ class LanguageSelection(Screen):
 		self.run()
 		self.close()
 	
+	def cancel(self):
+		language.activateLanguage(self.oldActiveLanguage)
+		self.close()
+	
 	def run(self):
 		language.activateLanguage(self["list"].l.getCurrentSelection()[0])
 		config.osd.language.value = self["list"].l.getCurrentSelection()[0]