git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add 'layers' (in buffered mode, which is not working at the moment).
[enigma2.git]
/
lib
/
python
/
Screens
/
Ci.py
diff --git
a/lib/python/Screens/Ci.py
b/lib/python/Screens/Ci.py
index f349d63aa81e2c46651ad916c8732004fadd651b..d19386b21ef7d9b46df2eb2479b3d9d374e4ffe2 100644
(file)
--- 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)
print "MMIDialog with action" + str(action)
+ self.mmiclosed = False
self.tag = None
self.slotid = slotid
self.tag = None
self.slotid = slotid
@@
-113,10
+114,9
@@
class MMIDialog(Screen):
def keyCancel(self):
self.timer.stop()
def keyCancel(self):
self.timer.stop()
- if not self.tag:
+ if not self.tag
or self.mmiclosed
:
self.closeMmi()
self.closeMmi()
- return
- if self.tag == "WAIT":
+ elif self.tag == "WAIT":
self.handler.stopMMI(self.slotid)
self.closeMmi()
elif self.tag in [ "MENU", "LIST" ]:
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.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:
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":
self.tag = screen[0][0]
for entry in screen:
if entry[0] == "PIN":