From: Ronny Strutz <ronny.strutz@multimedia-labs.de>
Date: Fri, 18 Nov 2005 03:25:11 +0000 (+0000)
Subject: close ciwait when module removed
X-Git-Tag: 2.6.0~5083
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/eddb50cddd7f1a26af7c08820b6c556d9977efba

close ciwait when module removed
---

diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py
index 66f4c730..eb61e739 100644
--- a/lib/python/Screens/Ci.py
+++ b/lib/python/Screens/Ci.py
@@ -17,6 +17,10 @@ class CiWait(Screen):
 	def cancel(self):
 		#stop pending requests
 		self.Timer.stop()
+
+		if self.lastQuery == 2:
+			eDVBCI_UI.getInstance().stopMMI(self.slot)
+
 		self.close()
 
 	def TimerCheck(self):
@@ -25,6 +29,9 @@ class CiWait(Screen):
 			self.cancel()
 		elif self.lastQuery == 1:
 			self.cancel()
+		else:
+			if eDVBCI_UI.getInstance().getState(self.slot) != 2:	#module removed
+				self.cancel()
 
 	def __init__(self, session, slot, query):
 		Screen.__init__(self, session)
@@ -37,16 +44,16 @@ class CiWait(Screen):
 			})
 			
 		self.lastQuery = query
+		self.slot = slot
 
 		self.Timer = eTimer()
 		self.Timer.timeout.get().append(self.TimerCheck)
+		self.Timer.start(1000)					#check and block 1 second
 
 		if query == 0:									#reset
-			self.Timer.start(1000)				#block 1 second
 			print "reset"
 			eDVBCI_UI.getInstance().setReset(slot)
 		if query == 1:									#init
-			self.Timer.start(1000)				#block 1 second
 			print "init"
 			eDVBCI_UI.getInstance().initialize(slot)
 		if query == 2:									#mmi-open