summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2006-06-18 08:50:04 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2006-06-18 08:50:04 +0200
commit2be1771869a37f339cb9dbd772aa388b5c7b8f16 (patch)
tree9d0eb177860b342fc33c9ab3d5facfd21f00a170
parent9fe7b98cdb656c8c6f0a0ea7bc2d5cfa68696c02 (diff)
downloadvdr-2be1771869a37f339cb9dbd772aa388b5c7b8f16.tar.gz
vdr-2be1771869a37f339cb9dbd772aa388b5c7b8f16.tar.bz2
Now making sure a VPS timer has a schedule in case the epg.data file didn't contain one when VDR was started1.4.1-1
-rw-r--r--HISTORY4
-rw-r--r--vdr.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index 5fb2bf58..796f4437 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4783,7 +4783,7 @@ Video Disk Recorder Revision History
so that they can be suppressed in normal operation mode to avoid clogging the
log file in case this function is used frequently (suggested by Helmut Auer).
-2006-06-17: Version 1.4.1-1
+2006-06-18: Version 1.4.1-1
- Added "-fPIC" to the compiler options in Make.config.template when compiling
plugins (thanks to Udo Richter). If you use your own Make.config file, you may
@@ -4799,3 +4799,5 @@ Video Disk Recorder Revision History
(thanks to Prakash Punnoor).
- Fixed handling relative link targets in the ReadLink() function (reported by
Patrick Cernko).
+- Now making sure a VPS timer has a schedule in case the epg.data file didn't
+ contain one when VDR was started.
diff --git a/vdr.c b/vdr.c
index 2ff9e8cb..09ea29ef 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/vdr
*
- * $Id: vdr.c 1.275 2006/06/16 09:17:24 kls Exp $
+ * $Id: vdr.c 1.276 2006/06/18 08:49:20 kls Exp $
*/
#include <getopt.h>
@@ -787,6 +787,7 @@ int main(int argc, char *argv[])
const cSchedules *Schedules = cSchedules::Schedules(SchedulesLock);
if (Schedules) {
const cSchedule *Schedule = Schedules->GetSchedule(Timer->Channel());
+ InVpsMargin = !Schedule; // we must make sure we have the schedule
NeedsTransponder = Schedule && !Schedule->PresentSeenWithin(VPSUPTODATETIME);
}
}