aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Screens/Standby.py
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2009-02-11 12:52:48 +0100
committerFelix Domke <tmbinc@elitedvb.net>2009-02-11 12:52:48 +0100
commitbbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b (patch)
treec5945c791698c14723e989449e6b4bfcc275c05d /lib/python/Screens/Standby.py
parent4f7990ff2a55874b9eb65e3c9cd47dacb9f76deb (diff)
parent5e6f814d005a01caa437a532e61f4b338617ff67 (diff)
downloadenigma2-bbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b.tar.gz
enigma2-bbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b.zip
Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
Conflicts: lib/dvb/decoder.cpp
Diffstat (limited to 'lib/python/Screens/Standby.py')
-rw-r--r--lib/python/Screens/Standby.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index 4c3a1720..d09f28af 100644
--- a/lib/python/Screens/Standby.py
+++ b/lib/python/Screens/Standby.py
@@ -2,6 +2,7 @@ from Screen import Screen
from Components.ActionMap import ActionMap
from Components.config import config
from Components.AVSwitch import AVSwitch
+from Components.SystemInfo import SystemInfo
from enigma import eDVBVolumecontrol
inStandby = None
@@ -49,7 +50,10 @@ class Standby(Screen):
#stop actual played dvb-service
self.session.nav.stopService()
#set input to vcr scart
- self.avswitch.setInput("SCART")
+ if SystemInfo["ScartSwitch"]:
+ self.avswitch.setInput("SCART")
+ else:
+ self.avswitch.setInput("AUX")
#set lcd brightness to standby value
config.lcd.standby.apply()
self.onShow.append(self.__onShow)