better (and more correct) fix

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index a6106e1edd1c498f00919ffc4a63a16b8c648e0c..cfcb52840e4e4a558cb2a12089f63e95ed42610b 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -22,7 +22,10 @@ class Screen(dict, HTMLSkin, GUISkin):
                self.onHide = [ ]
 
                self.execing = False
+               
                self.shown = True
+               # already shown is false until the screen is really shown (after creation)
+               self.already_shown = False
 
                self.renderer = [ ]
 
@@ -113,10 +116,11 @@ class Screen(dict, HTMLSkin, GUISkin):
        def setFocus(self, o):
                self.instance.setFocus(o.instance)
 
-       def show(self, force = False):
-               if (self.shown and not force) or not self.instance:
+       def show(self):
+               if (self.shown and self.already_shown) or not self.instance:
                        return
                self.shown = True
+               self.already_shown = True
                self.instance.show()
                for x in self.onShow:
                        x()

diff --git a/mytest.py b/mytest.py
index 452dd3d70abc66cb0a6318ce7c998eed71331648..8d8036b9cc733348bb04672cc838c938d5d8f416 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -173,11 +173,7 @@ class Session:
 
                # when execBegin opened a new dialog, don't bother showing the old one.
                if c == self.current_dialog and do_show:
-                       # this is the first show() for each screen.
-                       # screen.shown is already true, because that resembles the state 
-                       # ("not-yet-shown-but-will-be-shown") best, so c.show() would just do nothing.
-                       # show(force=True) will show in any case.
-                       c.show(force = True)
+                       c.show()
 
        def execEnd(self, last=True):
                assert self.in_exec