git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ceebb28
)
fix returning screen in openWithCallback
author
Andreas Monzner
<andreas.monzner@multimedia-labs.de>
Wed, 19 Apr 2006 20:33:01 +0000
(20:33 +0000)
committer
Andreas Monzner
<andreas.monzner@multimedia-labs.de>
Wed, 19 Apr 2006 20:33:01 +0000
(20:33 +0000)
re-add close assertion
mytest.py
patch
|
blob
|
history
diff --git
a/mytest.py
b/mytest.py
index e953d8f309e33d7aab114df4de9f4b652a4b6c49..8b3ad4972106bdf59533785680b5e3d21ccb7803 100644
(file)
--- a/
mytest.py
+++ b/
mytest.py
@@
-250,6
+250,7
@@
class Session:
def openWithCallback(self, callback, screen, *arguments, **kwargs):
dlg = self.open(screen, *arguments, **kwargs)
dlg.callback = callback
def openWithCallback(self, callback, screen, *arguments, **kwargs):
dlg = self.open(screen, *arguments, **kwargs)
dlg.callback = callback
+ return dlg
def open(self, screen, *arguments, **kwargs):
if len(self.dialog_stack) and not self.in_exec:
def open(self, screen, *arguments, **kwargs):
if len(self.dialog_stack) and not self.in_exec:
@@
-278,7
+279,7
@@
class Session:
# after close of the top dialog, the underlying will
# gain focus again (for a short time), thus triggering
# the onExec, which opens the dialog again, closing the loop.
# after close of the top dialog, the underlying will
# gain focus again (for a short time), thus triggering
# the onExec, which opens the dialog again, closing the loop.
-
#
assert screen == self.current_dialog
+ assert screen == self.current_dialog
self.current_dialog.returnValue = retval
self.delay_timer.start(0, 1)
self.current_dialog.returnValue = retval
self.delay_timer.start(0, 1)