X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0c2185a46606c2ac3e41205fe92e6d5ba4ead1b9..3a044bea307a02147e2d01ad29f07b7348bd7203:/lib/python/Screens/Standby.py

diff --git a/lib/python/Screens/Standby.py b/lib/python/Screens/Standby.py
index 4c3a1720..d3767f33 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)
@@ -66,10 +70,12 @@ class Standby(Screen):
 	def __onShow(self):
 		global inStandby
 		inStandby = self
+		self.session.screen["Standby"].boolean = True
 
 	def __onHide(self):
 		global inStandby
 		inStandby = None
+		self.session.screen["Standby"].boolean = False
 
 class StandbySummary(Screen):
 	skin = """
@@ -83,9 +89,6 @@ class StandbySummary(Screen):
 		</widget>
 	</screen>"""
 
-	def __init__(self, session, parent):
-		Screen.__init__(self, session)
-
 from enigma import quitMainloop, iRecordableService
 from Screens.MessageBox import MessageBox
 from time import time
@@ -96,7 +99,7 @@ inTryQuitMainloop = False
 class TryQuitMainloop(MessageBox):
 	def __init__(self, session, retvalue=1, timeout=-1, default_yes = True):
 		self.retval=retvalue
-		recordings = len(session.nav.getRecordings())
+		recordings = session.nav.getRecordings()
 		jobs = len(job_manager.getPendingJobs())
 		self.connected = False
 		reason = ""
@@ -133,7 +136,7 @@ class TryQuitMainloop(MessageBox):
 	def getRecordEvent(self, recservice, event):
 		if event == iRecordableService.evEnd:
 			recordings = self.session.nav.getRecordings()
-			if not len(recordings): # no more recordings exist
+			if not recordings: # no more recordings exist
 				rec_time = self.session.nav.RecordTimer.getNextRecordingTime()
 				if rec_time > 0 and (rec_time - time()) < 360:
 					self.initTimeout(360) # wait for next starting timer