Fixed skipping unavailable channels in the EPG scanner

HISTORY

@@ -1940,3 +1940,4 @@ Video Disk Recorder Revision History
 - Changed EIT processing to always read a full section.
 - Fixed handling user defined CFLAGS in libdtv/libvdr/Makefile (thanks to Clemens
   Kirchgatterer and Robert Schiele).
+- Fixed skipping unavailable channels in the EPG scanner.

eitscan.c

@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: eitscan.c 1.10 2002/11/01 11:04:49 kls Exp $
+ * $Id: eitscan.c 1.11 2003/01/26 16:19:24 kls Exp $
  */
 
 #include "eitscan.h"
@@ -51,6 +51,8 @@ void cEITScanner::Process(void)
   if (Setup.EPGScanTimeout && Channels.MaxNumber() > 1) {
      time_t now = time(NULL);
      if (now - lastScan > ScanTimeout && now - lastActivity > ActivityTimeout) {
+        do {
+           int oldLastChannel = lastChannel;
            for (int i = 0; i < cDevice::NumDevices(); i++) {
                cDevice *Device = cDevice::GetDevice(i);
                if (Device && Device->CardIndex() < MAXDVBDEVICES) {
@@ -80,9 +82,11 @@ void cEITScanner::Process(void)
                         }
                      }
                   }
-            else
-               lastChannel++; // avoid hangup in case the last channel in the list is not provided by a DVB card
                }
+           if (lastChannel != oldLastChannel)
+              break;
+           lastChannel++;
+           } while (time(NULL) - now < 2);
         lastScan = time(NULL);
         }
      }