diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 27249afc..4299eb5d 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2792,6 +2792,8 @@ Gerald Dachs Juergen Lock for fixing cUnbufferedFile::Seek() in case it is compiled without USE_FADVISE + for reporting a problem with EPG scan on systems with only a single DVB device that + use software output Sergiu Dotenco for reporting a missing initialization in sDvbSpuRect diff --git a/HISTORY b/HISTORY index e4ddf093..e5e33e44 100644 --- a/HISTORY +++ b/HISTORY @@ -7052,7 +7052,7 @@ Video Disk Recorder Revision History - Fixed handling IDLEPRIORITY in cDvbDevice::ProvidesChannel() (thanks to Frank Schmirler). -2012-04-06: Version 1.7.28 +2012-04-07: Version 1.7.28 - Fixed cPixmapMemory::DrawEllipse() for quadrants -1 and -4. - Fixed getting the maximum short channel name length in case there are no short names @@ -7062,3 +7062,5 @@ Video Disk Recorder Revision History - Now limiting the number of characters of a channel's (short) name to 16 in the schedules menus, to keep that column from getting overly wide in case there is a channel with a very long name that has no short name. +- Fixed EPG scan on systems with only a single DVB device that use software output + (reported by Juergen Lock). diff --git a/eitscan.c b/eitscan.c index 990518ed..027bf44c 100644 --- a/eitscan.c +++ b/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 2.6 2012/03/07 14:16:57 kls Exp $ + * $Id: eitscan.c 2.7 2012/04/07 14:39:28 kls Exp $ */ #include "eitscan.h" @@ -148,7 +148,7 @@ void cEITScanner::Process(void) if (Channel) { if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= CA_ENCRYPTED_MIN) { if (Device->ProvidesTransponder(Channel)) { - if (!Device->Receiving()) { + if (Device->Priority() < 0) { bool MaySwitchTransponder = Device->MaySwitchTransponder(Channel); if (MaySwitchTransponder || Device->ProvidesTransponderExclusively(Channel) && now - lastActivity > Setup.EPGScanTimeout * 3600) { if (!MaySwitchTransponder) {