X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/58f7595413ff237526e5342d2346255d9396e60d..afe7d8cacb1875f0e86a9f970dac9280dba20462:/lib/python/Screens/Screen.py

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index 797acbc9..ed61d9d6 100644
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -1,8 +1,7 @@
-from Components.HTMLSkin import *
-from Components.GUISkin import *
+from Components.HTMLSkin import HTMLSkin
+from Components.GUISkin import GUISkin
 from Components.Sources.Source import Source
-
-import sys
+from Components.GUIComponent import GUIComponent
 
 class Screen(dict, HTMLSkin, GUISkin):
 
@@ -12,26 +11,29 @@ 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
+		# already shown is false until the screen is really shown (after creation)
+		self.already_shown = False
+
 		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
@@ -114,9 +116,10 @@ class Screen(dict, HTMLSkin, GUISkin):
 		self.instance.setFocus(o.instance)
 
 	def show(self):
-		if self.shown:
+		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()
@@ -125,7 +128,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()