3 files changed, 6 insertions, 3 deletions

diff --git a/HISTORY b/HISTORY
index 883e46a1..cb1d0e32 100644
--- a/HISTORY
+++ b/HISTORY
@@ -402,3 +402,5 @@ Video Disk Recorder Revision History
 - Support for DVB-C (thanks to Hans-Peter Raschke and Peter Hofmann).
   See the INSTALL file for more information about the use of VDR with cable.
 - Fixed an occasional segfault in the EIT processor.
+- A value of '0' for the EPGScanTimeout setup parameter now completely turns off
+  scanning for EPG data on both single and multiple card systems.
diff --git a/MANUAL b/MANUAL
index e16a98ae..009f8de1 100644
--- a/MANUAL
+++ b/MANUAL
@@ -326,7 +326,8 @@ Video Disk Recorder User's Manual
   EPGScanTimeout = 5     The time (in hours) of user inactivity after which the
                          DVB card in a single card system starts scanning channels
                          to keep the EPG up-to-date.
-                         A value of '0' turns off scanning on a single card system.
+                         A value of '0' completely turns off scanning on both single
+                         and multiple card systems.
 
   SVDRPTimeout = 300     The time (in seconds) of inactivity on an open SVDRP
                          connection after which the connection is automatically
diff --git a/dvbapi.c b/dvbapi.c
index 470835ac..15b5f357 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.59 2001/02/20 17:40:57 kls Exp $
+ * $Id: dvbapi.c 1.60 2001/02/24 12:18:30 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -2395,7 +2395,7 @@ void cEITScanner::Activity(void)
 
 void cEITScanner::Process(void)
 {
-  if (Channels.MaxNumber() > 1) {
+  if (Setup.EPGScanTimeout && Channels.MaxNumber() > 1) {
      time_t now = time(NULL);
      if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) {
         for (int i = 0; i < cDvbApi::NumDvbApis; i++) {