summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2006-05-13 09:09:34 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2006-05-13 09:09:34 +0200
commit946f9dfb7805092b1011a2fa44ad65a2c4fe872b (patch)
tree991613658f154b8d298bf03e40e366ed676127a3
parent046595a803b9ae7100f7bfac9804126edd19e870 (diff)
downloadvdr-946f9dfb7805092b1011a2fa44ad65a2c4fe872b.tar.gz
vdr-946f9dfb7805092b1011a2fa44ad65a2c4fe872b.tar.bz2
Now always making sure the EPG scan is paused when a VPS timer needs to see its transponder to update its event
-rw-r--r--vdr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/vdr.c b/vdr.c
index ea762d38..b8a005d0 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.269 2006/05/07 09:13:36 kls Exp $
+ * $Id: vdr.c 1.270 2006/05/13 09:09:34 kls Exp $
*/
#include <getopt.h>
@@ -768,7 +768,7 @@ int main(int argc, char *argv[])
bool NeedsTransponder = false;
if (Timer->HasFlags(tfActive | tfVps) && !Timer->Recording()) {
if (Timer->Matches(Now, true, Setup.VpsMargin))
- TimerInVpsMargin = InVpsMargin = true;
+ InVpsMargin = true;
else if (Timer->Event())
NeedsTransponder = Timer->Event()->StartTime() - Now < VPSLOOKAHEADTIME * 3600 && !Timer->Event()->SeenWithin(VPSUPTODATETIME);
else {
@@ -779,6 +779,7 @@ int main(int argc, char *argv[])
NeedsTransponder = Schedule && !Schedule->PresentSeenWithin(VPSUPTODATETIME);
}
}
+ TimerInVpsMargin |= InVpsMargin | NeedsTransponder;
}
Timer->SetInVpsMargin(InVpsMargin);
if (NeedsTransponder || InVpsMargin) {