diff options
| author | Ronny Strutz <ronny.strutz@multimedia-labs.de> | 2005-11-18 03:25:11 +0000 |
|---|---|---|
| committer | Ronny Strutz <ronny.strutz@multimedia-labs.de> | 2005-11-18 03:25:11 +0000 |
| commit | eddb50cddd7f1a26af7c08820b6c556d9977efba (patch) | |
| tree | b15c843939d3f27ac9a7562cf67d339d1dd7421f /lib | |
| parent | 821099592d721f82eeb92c32c7e8e60847c37294 (diff) | |
| download | enigma2-eddb50cddd7f1a26af7c08820b6c556d9977efba.tar.gz enigma2-eddb50cddd7f1a26af7c08820b6c556d9977efba.zip | |
close ciwait when module removed
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/python/Screens/Ci.py | 11 |
1 files changed, 9 insertions, 2 deletions
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 |