aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2007-11-23 18:34:19 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2007-11-23 18:34:19 +0000
commit2a1b3e92f806c2e2abb85d1cc6f71c187ca7d0c3 (patch)
tree236cc4405bcb0a3243e7ce8d0317973642cb9a57
parent2aef8d2784813195c7a888d2be77af3fbc392615 (diff)
downloadenigma2-2a1b3e92f806c2e2abb85d1cc6f71c187ca7d0c3.tar.gz
enigma2-2a1b3e92f806c2e2abb85d1cc6f71c187ca7d0c3.zip
small fix
-rw-r--r--lib/python/Screens/Ci.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py
index f349d63a..d19386b2 100644
--- a/lib/python/Screens/Ci.py
+++ b/lib/python/Screens/Ci.py
@@ -22,6 +22,7 @@ class MMIDialog(Screen):
print "MMIDialog with action" + str(action)
+ self.mmiclosed = False
self.tag = None
self.slotid = slotid
@@ -113,10 +114,9 @@ class MMIDialog(Screen):
def keyCancel(self):
self.timer.stop()
- if not self.tag:
+ if not self.tag or self.mmiclosed:
self.closeMmi()
- return
- if self.tag == "WAIT":
+ elif self.tag == "WAIT":
self.handler.stopMMI(self.slotid)
self.closeMmi()
elif self.tag in [ "MENU", "LIST" ]:
@@ -174,11 +174,13 @@ class MMIDialog(Screen):
self.timer.stop()
if len(screen) > 0 and screen[0][0] == "CLOSE":
timeout = screen[0][1]
+ self.mmiclosed = True
if timeout > 0:
self.timer.start(timeout*1000, True)
else:
self.keyCancel()
else:
+ self.mmiclosed = False
self.tag = screen[0][0]
for entry in screen:
if entry[0] == "PIN":