summaryrefslogtreecommitdiff
path: root/vdr.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2004-03-07 09:40:51 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2004-03-07 09:40:51 +0100
commite070d5462cf3d790f7230e872d517d35b67c9a6d (patch)
tree9e1544c470e5a5631bb5e30c628d8c9e921d896b /vdr.c
parent12c0b0dd1507ccb6aa4d83ebc43f248816ff30f4 (diff)
downloadvdr-e070d5462cf3d790f7230e872d517d35b67c9a6d.tar.gz
vdr-e070d5462cf3d790f7230e872d517d35b67c9a6d.tar.bz2
Fixed handling timers in VPS margin if the EPG scan is turned on
Diffstat (limited to 'vdr.c')
-rw-r--r--vdr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/vdr.c b/vdr.c
index 2da8349c..ec03c21a 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.178 2004/02/29 14:21:22 kls Exp $
+ * $Id: vdr.c 1.179 2004/03/07 09:39:54 kls Exp $
*/
#include <getopt.h>
@@ -571,7 +571,6 @@ int main(int argc, char *argv[])
if (Timer->HasFlags(tfActive | tfVps) && !Timer->Recording() && !Timer->Pending() && Timer->Matches(Now + Setup.VpsMargin, true)) {
if (!Timer->InVpsMargin()) {
Timer->SetInVpsMargin(true);
- TimerInVpsMargin = true;
//XXX if not primary device has TP???
LastTimerChannel = Timer->Channel()->Number();
cRecordControls::Start(Timer); // will only switch the device
@@ -579,6 +578,8 @@ int main(int argc, char *argv[])
}
else
Timer->SetInVpsMargin(false);
+ if (Timer->InVpsMargin())
+ TimerInVpsMargin = true;
}
}
// CAM control: