X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/29dda647f09e42ac3a621bbb537558c2d1bbc7b4..6c2d3fc303542b7f77f4350974acf781a1b91c30:/lib/python/Screens/LanguageSelection.py

diff --git a/lib/python/Screens/LanguageSelection.py b/lib/python/Screens/LanguageSelection.py
index 41857375..6b18121f 100644
--- a/lib/python/Screens/LanguageSelection.py
+++ b/lib/python/Screens/LanguageSelection.py
@@ -14,7 +14,8 @@ class LanguageSelection(Screen):
 		self.list = []
 		self["list"] = LanguageList(self.list)
 		self.updateList()
-		
+		self.onLayoutFinish.append(self.selectActiveLanguage)
+				
 		self["actions"] = ActionMap(["OkCancelActions", "DirectionActions"], 
 		{
 			"ok": self.save,
@@ -25,6 +26,9 @@ class LanguageSelection(Screen):
 			"right": self.right
 		}, -1)
 		
+	def selectActiveLanguage(self):
+		self["list"].instance.moveSelectionTo(language.activeLanguage)
+		
 	def save(self):
 		self.run()
 		self.close()
@@ -33,7 +37,7 @@ class LanguageSelection(Screen):
 		language.activateLanguage(self["list"].l.getCurrentSelectionIndex())
 		config.osd.language.value = self["list"].l.getCurrentSelectionIndex()
 		config.osd.language.save()
-		self.session.currentDialog.instance.setTitle(_("Language selection"))
+		self.setTitle(_("Language selection"))
 
 	def updateList(self):
 		self.list = []