X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/08fca93e7f2a37a452399d08c5c84b969b7e52af..a49930b82dabfd301ad358e0e014ae9327d6afe8:/lib/python/Screens/LanguageSelection.py

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index 1d2fd787..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]
@@ -54,7 +60,7 @@ class LanguageSelection(Screen):
 		else:
 			for x in language.getLanguageList():
 				self.list.append(LanguageEntryComponent(file = x[1][3].lower(), name = _(x[1][0]), index = x[0]))
-		self.list.sort(key=lambda x: x[1][7])
+		#self.list.sort(key=lambda x: x[1][7])
 		self["list"].l.setList(self.list)
 
 	def up(self):