aboutsummaryrefslogtreecommitdiff
path: root/lib/python
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2006-04-18 18:49:26 +0000
committerFelix Domke <tmbinc@elitedvb.net>2006-04-18 18:49:26 +0000
commitb0ce62b0d959fd0d2d20022d803acb1c100d2bb5 (patch)
tree063dfe044b083b06b785a7a9c1d4f22b26ffa8fd /lib/python
parent7e5b8dd9905ecfc6491ff035bcc81ac0a37279d0 (diff)
downloadenigma2-b0ce62b0d959fd0d2d20022d803acb1c100d2bb5.tar.gz
enigma2-b0ce62b0d959fd0d2d20022d803acb1c100d2bb5.zip
fix Scart.py, add some asserts to find this kind of bugs earlier
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/Screens/Scart.py6
-rw-r--r--lib/python/Screens/Screen.py2
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/python/Screens/Scart.py b/lib/python/Screens/Scart.py
index cae46b23..e8b7a4a7 100644
--- a/lib/python/Screens/Scart.py
+++ b/lib/python/Screens/Scart.py
@@ -13,11 +13,13 @@ class Scart(Screen):
self.avswitch.setInput("SCART")
- self.onShown.append(self.showMessageBox)
+ self.onExecBegin.append(self.showMessageBox)
def showMessageBox(self):
+ # only open messagebox on first execBegin
+ self.onShown.remove(self.showMessageBox)
self.session.openWithCallback(self.switchToTV, MessageBox, _("If you see this, something is wrong with\nyour scart connection. Press OK to return."), MessageBox.TYPE_ERROR)
- def switchToTV(self, val):
+ def switchToTV(self, *val):
self.avswitch.setInput("ENCODER")
self.close()
diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index d4b3d729..e6abdef9 100644
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -74,7 +74,7 @@ class Screen(dict, HTMLSkin, GUISkin):
self.__dict__.clear()
def close(self, *retval):
- self.session.close(*retval)
+ self.session.close(self, *retval)
def setFocus(self, o):
self.instance.setFocus(o.instance)