Fixed VPS handling when spawning a pattern timer, in case Setup.UseVps is false

3 files changed, 7 insertions, 3 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 0926d4c0..32d2a621 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -3662,6 +3662,8 @@ Jürgen Schneider <jsffm@web.de>
  for adding support for EAC3 audio from other sources
  for reporting a crash if a pattern timer spawns a timer that uses EPISODE and the
  event has no short text
+ for reporting a bug in VPS handling when spawning a pattern timer, in case Setup.UseVps
+ is false
 
 Stefan Verse <Verse@amotronics.de>
  for fixing an occasional black screen when switching channels
diff --git a/HISTORY b/HISTORY
index ea592942..81763ebe 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9578,7 +9578,7 @@ Video Disk Recorder Revision History
   given (reported by Manuel Reimer).
 - Fixed handling $(PKG_CONFIG) in newplugin (thanks to Winfried Köhler).
 
-2021-01-04:
+2021-01-07:
 
 - Fixed strreplace() to handle NULL strings (reported by Jürgen Schneider).
 - Somewhere down the road the 'x' bit of Doxyfile.filter got lost, so the
@@ -9589,3 +9589,5 @@ Video Disk Recorder Revision History
 - Fixed handling $(PKG_CONFIG) in newplugin (thanks to Winfried Köhler).
 - Fixed initializing the cChannel::schedule pointer after reading EPG data with PUTE
   (reported by Manuel Reimer).
+- Fixed VPS handling when spawning a pattern timer, in case Setup.UseVps is false
+  (reported by Jürgen Schneider).
diff --git a/timers.c b/timers.c
index 2f16c8c8..7855bb16 100644
--- a/timers.c
+++ b/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.1 2020/12/26 15:49:01 kls Exp $
+ * $Id: timers.c 5.2 2021/01/07 16:00:17 kls Exp $
  */
 
 #include "timers.h"
@@ -183,7 +183,7 @@ cTimer::cTimer(const cEvent *Event, const char *FileName, const cTimer *PatternT
   remote = NULL;
   event = NULL;
   if (!PatternTimer || PatternTimer->HasFlags(tfVps)) {
-     if (Event->Vps() && Setup.UseVps)
+     if (Event->Vps() && (PatternTimer || Setup.UseVps))
         SetFlags(tfVps);
      }
   LOCK_CHANNELS_READ;