X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=RecordTimer.py;h=1608caaf74ad1fe2fb27d3e8745f6bb9c8e525d7;hp=04c3ff122a2fd9dd7e81ccca82d64564f380986e;hb=f7f442a1d0845e7dfd923c1d783eb612357f3e94;hpb=bea4946ae09bcab368696c50031e29c635017585

diff --git a/RecordTimer.py b/RecordTimer.py
index 04c3ff1..1608caa 100755
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -138,14 +138,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)