Fixed handling VPS timers, so that they only record if the event they are assigned to actually has the given VPS time (cont'd, fix, caused repeating VPS timers to stop recording prematurely)

2 files changed, 4 insertions, 3 deletions

diff --git a/HISTORY b/HISTORY
index 3dc29f97..180b19de 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3643,3 +3643,6 @@ Video Disk Recorder Revision History
 - cDvbPlayer::Goto() now appends a Sequence End Code to get the image shown
   immediately with softdevices (thanks to Reinhard Nissl).
 - Reactivated cVideoRepacker in remux.c after some fixes (thanks to Reinhard Nissl).
+- Removed the fix for handling VPS timers, so that they only record if the event
+  they are assigned to actually has the given VPS time. This has caused repeating
+  VPS timers to stop recording prematurely.
diff --git a/timers.c b/timers.c
index f6903367..9e80b494 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 1.33 2005/06/18 12:49:55 kls Exp $
+ * $Id: timers.c 1.34 2005/07/30 13:03:51 kls Exp $
  */
 
 #include "timers.h"
@@ -363,8 +363,6 @@ bool cTimer::Matches(time_t t, bool Directly) const
 
   if (HasFlags(tfActive)) {
      if (HasFlags(tfVps) && !Directly && event && event->Vps() && schedule && schedule->PresentSeenWithin(30)) {
-        if (startTime != event->Vps())
-           return false;
         startTime = event->StartTime();
         stopTime = event->EndTime();
         return event->IsRunning(true);