X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=RecordTimer.py;h=4ece9c58133a76216017010d5b165c0c2aabc0cb;hp=04c3ff122a2fd9dd7e81ccca82d64564f380986e;hb=a97f3cb3fc63e25d6378a75cb7649563d18f2a5e;hpb=10db7be1b01656e6c5dec4954841ea803b73b884

diff --git a/RecordTimer.py b/RecordTimer.py
index 04c3ff1..4ece9c5 100755
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -102,7 +102,10 @@ class RecordTimerEntry(timer.TimerEntry, object):
 		
 		assert isinstance(serviceref, ServiceReference)
 		
-		self.service_ref = serviceref
+		if serviceref.isRecordable():
+			self.service_ref = serviceref
+		else:
+			self.service_ref = ServiceReference(None)
 		self.eit = eit
 		self.dontSave = False
 		self.name = name
@@ -138,14 +141,15 @@ class RecordTimerEntry(timer.TimerEntry, object):
 		
 		filename = begin_date + " - " + service_name
 		if self.name:
-			filename += " - " + self.name
 			if config.usage.setup_level.index >= 2: # expert+
 				if config.recording.filename_composition.value == "short":
 					filename = begin_shortdate + " - " + self.name
 				elif config.recording.filename_composition.value == "long":
-					filename = begin_date + " - " + service_name + " - " + self.name + " - " + self.description
+					filename += " - " + self.name + " - " + self.description
 				else:
 					filename += " - " + self.name # standard
+			else:
+				filename += " - " + self.name
 
 		if config.recording.ascii_filenames.value:
 			filename = ASCIItranslit.legacyEncode(filename)