consider screens which haven't finished their initialization as shown. this fixes...

[enigma2.git] / lib / python / Screens / Screen.py

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index 797acbc946d99c63c5a28883a0cf79a9221f157e..a6106e1edd1c498f00919ffc4a63a16b8c648e0c 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -12,26 +12,26 @@ class Screen(dict, HTMLSkin, GUISkin):
                self.skinName = self.__class__.__name__
                self.session = session
                GUISkin.__init__(self)
-               
+
                self.onClose = [ ]
                self.onFirstExecBegin = [ ]
                self.onExecBegin = [ ]
                self.onShown = [ ]
-               
+
                self.onShow = [ ]
                self.onHide = [ ]
-               
+
                self.execing = False
-               self.shown = False
-               
+               self.shown = True
+
                self.renderer = [ ]
-               
+
                # in order to support screens *without* a help,
                # we need the list in every screen. how ironic.
                self.helpList = [ ]
-               
+
                self.close_on_next_exec = None
-               
+
                # stand alone screens (for example web screens)
                # don't care about having or not having focus.
                self.stand_alone = False
@@ -113,8 +113,8 @@ class Screen(dict, HTMLSkin, GUISkin):
        def setFocus(self, o):
                self.instance.setFocus(o.instance)
 
-       def show(self):
-               if self.shown:
+       def show(self, force = False):
+               if (self.shown and not force) or not self.instance:
                        return
                self.shown = True
                self.instance.show()
@@ -125,7 +125,7 @@ class Screen(dict, HTMLSkin, GUISkin):
                                val.onShow()
 
        def hide(self):
-               if not self.shown:
+               if not self.shown or not self.instance:
                        return
                self.shown = False
                self.instance.hide()