mirror of
				https://github.com/vdr-projects/vdr.git
				synced 2025-03-01 10:50:46 +00:00 
			
		
		
		
	Fixed MakePatternFileName() in case the event doesn't yet have a short text
This commit is contained in:
		| @@ -3669,6 +3669,8 @@ J | ||||
|  is false | ||||
|  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 | ||||
|  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> | ||||
|  for fixing an occasional black screen when switching channels | ||||
|   | ||||
							
								
								
									
										2
									
								
								HISTORY
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								HISTORY
									
									
									
									
									
								
							| @@ -9636,3 +9636,5 @@ Video Disk Recorder Revision History | ||||
| - Spawned timers that don't use VPS now automatically adjust their start/stop times | ||||
|   to changes in the respective event's times. | ||||
| - 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). | ||||
|   | ||||
							
								
								
									
										3
									
								
								timers.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								timers.c
									
									
									
									
									
								
							| @@ -4,7 +4,7 @@ | ||||
|  * See the main source file 'vdr.c' for copyright information and | ||||
|  * 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" | ||||
| @@ -163,6 +163,7 @@ static cString MakePatternFileName(const char *Pattern, const char *Title, const | ||||
|   if (MatchPattern(Pattern, Title, &Before, &Match, &After)) { | ||||
|      char *Result = strdup(File); | ||||
|      Result = strreplace(Result, TIMERMACRO_TITLE, Title); | ||||
|      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_MATCH, Match); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user