X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a14583fd5980859930449db86d7ac19f6352d84a..2b6021b22bea4aacfec94140138c3f42262bf5fb:/lib/python/Screens/LanguageSelection.py

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index e5be57ef..87fbc110 100644
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -10,22 +10,24 @@ from Components.config import config
 class LanguageSelection(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
-		
+
+		self.oldActiveLanguage = language.getActiveLanguage()
+
 		self.list = []
 		self["list"] = LanguageList(self.list)
 		self.updateList()
 		self.onLayoutFinish.append(self.selectActiveLanguage)
-				
+
 		self["actions"] = ActionMap(["OkCancelActions", "DirectionActions"], 
 		{
 			"ok": self.save,
-			"cancel": self.close,
+			"cancel": self.cancel,
 			"up": self.up,
 			"down": self.down,
 			"left": self.left,
 			"right": self.right
 		}, -1)
-		
+
 	def selectActiveLanguage(self):
 		activeLanguage = language.getActiveLanguage()
 		pos = 0
@@ -34,11 +36,15 @@ class LanguageSelection(Screen):
 				self["list"].instance.moveSelectionTo(pos)
 				break
 			pos += 1
-		
+
 	def save(self):
 		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]
@@ -61,7 +67,7 @@ class LanguageSelection(Screen):
 		self["list"].instance.moveSelection(self["list"].instance.moveUp)
 		self.run()
 		self.updateList()
-		
+
 	def down(self):
 		self["list"].instance.moveSelection(self["list"].instance.moveDown)
 		self.run()
@@ -71,8 +77,8 @@ class LanguageSelection(Screen):
 		self["list"].instance.moveSelection(self["list"].instance.pageUp)
 		self.run()
 		self.updateList()
-		
+
 	def right(self):
 		self["list"].instance.moveSelection(self["list"].instance.pageDown)
 		self.run()
-		self.updateList()
\ No newline at end of file
+		self.updateList()