enigma2: fixed possible audio selection crash, fixed broken skin isMultiChannel indic...
[opendreambox.git] / meta-opendreambox / recipes-dreambox / enigma2 / enigma2-4.3.0r3-dm7080 / 0003-allow-to-call-RecordTimerEntry.calculateFilename-wit.patch
1 From 926fe62d0b64fc6148c99b696c74e1c49e18e27c Mon Sep 17 00:00:00 2001
2 From: ghost <andreas.monzner@dream-property.net>
3 Date: Sat, 14 May 2016 00:54:49 +0200
4 Subject: [PATCH 3/3] allow to call RecordTimerEntry.calculateFilename without
5  argument again (to fix autotimer and seriesplugin)
6
7 ---
8  usr/lib/enigma2/python/RecordTimer.py | 5 +++--
9  1 file changed, 3 insertions(+), 2 deletions(-)
10
11 diff --git a/RecordTimer.py b/RecordTimer.py
12 index ed9d658..a8deca4 100644
13 --- a/usr/lib/enigma2/python/RecordTimer.py
14 +++ b/usr/lib/enigma2/python/RecordTimer.py
15 @@ -132,7 +132,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
16                 self.log_entries.append((int(time()), code, msg))
17                 print "[TIMER]", msg
18  
19 -       def calculateFilename(self, record_service):
20 +       def calculateFilename(self, record_service=None):
21                 service_name = self.service_ref.getServiceName()
22                 begin_date = strftime("%Y%m%d %H%M", localtime(self.begin))
23                 begin_shortdate = strftime("%Y%m%d", localtime(self.begin))
24 @@ -163,7 +163,8 @@ class RecordTimerEntry(timer.TimerEntry, object):
25                         dirname = defaultMoviePath()
26                 else:
27                         dirname = self.dirname
28 -               self.Filename = Directories.getRecordingFilename(filename, dirname) + record_service.getFileExtension()
29 +               self.Filename = Directories.getRecordingFilename(filename, dirname) + (".ts" if record_service is None else record_service.getFileExtension())
30 +
31                 self.log(0, "Filename calculated as: '%s'" % self.Filename)
32                 #begin_date + " - " + service_name + description)
33  
34 -- 
35 1.9.1
36