frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed MakePatternFileName() in case the event doesn't yet have a short text

This commit is contained in:
Klaus Schmidinger 2021-04-06 09:50:30 +02:00
parent 7fb13b3cbf
commit 19a0e3cda7
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -3669,6 +3669,8 @@ J
is false is false
for reporting an endless spawning of pattern timers in case the spawned timer doesn't for reporting an endless spawning of pattern timers in case the spawned timer doesn't
use VPS and fully overlaps a second event that is longer than the original one use VPS and fully overlaps a second event that is longer than the original one
for reporting a missing EPISODE macro expansion in case the event doesn't yet have a
short text when generating the pattern timer file name
Stefan Verse <Verse@amotronics.de> Stefan Verse <Verse@amotronics.de>
for fixing an occasional black screen when switching channels for fixing an occasional black screen when switching channels

2
HISTORY
View File

@ -9636,3 +9636,5 @@ Video Disk Recorder Revision History
- Spawned timers that don't use VPS now automatically adjust their start/stop times - Spawned timers that don't use VPS now automatically adjust their start/stop times
to changes in the respective event's times. to changes in the respective event's times.
- Fixed handling the timer counter in cSchedule::DelEvent(). - Fixed handling the timer counter in cSchedule::DelEvent().
- Fixed MakePatternFileName() in case the event doesn't yet have a short text (reported
by Jürgen Schneider).

5
timers.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: timers.c 5.7 2021/04/06 08:48:35 kls Exp $ * $Id: timers.c 5.8 2021/04/06 09:50:30 kls Exp $
*/ */
#include "timers.h" #include "timers.h"
@ -163,7 +163,8 @@ static cString MakePatternFileName(const char *Pattern, const char *Title, const
if (MatchPattern(Pattern, Title, &Before, &Match, &After)) { if (MatchPattern(Pattern, Title, &Before, &Match, &After)) {
char *Result = strdup(File); char *Result = strdup(File);
Result = strreplace(Result, TIMERMACRO_TITLE, Title); Result = strreplace(Result, TIMERMACRO_TITLE, Title);
Result = strreplace(Result, TIMERMACRO_EPISODE, Episode); if (!isempty(Episode)) // the event might not yet have a "short text", so we leave this to the actual recording
Result = strreplace(Result, TIMERMACRO_EPISODE, Episode);
Result = strreplace(Result, TIMERMACRO_BEFORE, Before); Result = strreplace(Result, TIMERMACRO_BEFORE, Before);
Result = strreplace(Result, TIMERMACRO_MATCH, Match); Result = strreplace(Result, TIMERMACRO_MATCH, Match);
Result = strreplace(Result, TIMERMACRO_AFTER, After); Result = strreplace(Result, TIMERMACRO_AFTER, After);