From: Andreas Monzner Date: Fri, 23 Nov 2007 18:34:19 +0000 (+0000) Subject: small fix X-Git-Tag: 2.6.0~1695 X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/2a1b3e92f806c2e2abb85d1cc6f71c187ca7d0c3?hp=2aef8d2784813195c7a888d2be77af3fbc392615 small fix --- 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":