X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/92eea9b3204d5caf7df17251f48e00d482c4a7d7..baa6968ed152a4e78ba27e3e48364a6b62680db2:/lib/python/Screens/Ci.py

diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py
index c3302a1c..b6f315b4 100644
--- a/lib/python/Screens/Ci.py
+++ b/lib/python/Screens/Ci.py
@@ -6,8 +6,6 @@ from Components.Header import Header
 from Components.Button import Button
 from Components.Label import Label
 
-from Components.HTMLComponent import *
-from Components.GUIComponent import *
 from Components.config import config, ConfigSubsection, ConfigSelection, ConfigSubList, getConfigListEntry, KEY_LEFT, KEY_RIGHT, KEY_0, ConfigNothing, ConfigPIN
 from Components.ConfigList import ConfigList
 
@@ -237,7 +235,8 @@ class CiMessageHandler:
 					print "no session"
 
 	def dlgClosed(self, slot):
-		del self.dlgs[slot]
+		if slot in self.dlgs:
+			del self.dlgs[slot]
 
 	def registerCIMessageHandler(self, slot, func):
 		self.unregisterCIMessageHandler(slot)
@@ -275,6 +274,12 @@ class CiSelection(Screen):
 		menuList.list = self.list
 		menuList.l.setList(self.list)
 		self["entries"] = menuList
+		self["entries"].onSelectionChanged.append(self.selectionChanged)
+		self["text"] = Label(_("Slot %d")%(1))
+
+	def selectionChanged(self):
+		cur_idx = self["entries"].getCurrentIndex()
+		self["text"].setText(_("Slot %d")%((cur_idx / 4)+1))
 
 	def keyConfigEntry(self, key):
 		try:
@@ -310,7 +315,7 @@ class CiSelection(Screen):
 		self.state[slot] = state
 
 		slotidx=0
-		while self.list[slotidx][2] != slot:
+		while len(self.list[slotidx]) < 3 or self.list[slotidx][3] != slot:
 			slotidx += 1
 
 		slotidx += 1 # do not change Reset