X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e7a4be1d20a33dbd97acfa021db2f8b82bf7a844..87b1a41106c4561a400536558d10dc703b3f81f4:/lib/python/Screens/Ci.py

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":