summaryrefslogtreecommitdiff
path: root/eitscan.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2005-08-26 16:05:29 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2005-08-26 16:05:29 +0200
commitc23d35e267d0127eaaf6e117b5546deb095d4bc4 (patch)
treec7fedbb54d635798f6275a26d763b95e6b9a9d9c /eitscan.c
parent7a57c099e54fac6bfd04f84059c21bffe448cc0f (diff)
downloadvdr-c23d35e267d0127eaaf6e117b5546deb095d4bc4.tar.gz
vdr-c23d35e267d0127eaaf6e117b5546deb095d4bc4.tar.bz2
Fixed the EPG scan, so that it doesn't use the primary device if that is currently in Transfer-Mode from itself
Diffstat (limited to 'eitscan.c')
-rw-r--r--eitscan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/eitscan.c b/eitscan.c
index 3894bcac..10739c31 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 1.27 2005/08/07 11:29:54 kls Exp $
+ * $Id: eitscan.c 1.28 2005/08/26 15:37:06 kls Exp $
*/
#include "eitscan.h"
@@ -150,7 +150,7 @@ void cEITScanner::Process(void)
if (!Channel->Ca() || Channel->Ca() == Device->DeviceNumber() + 1 || Channel->Ca() >= 0x0100) {
if (Device->ProvidesTransponder(Channel)) {
if (!Device->Receiving()) {
- bool IsPrimaryDeviceReplaying = Device == cDevice::PrimaryDevice() && Device->Replaying();
+ bool IsPrimaryDeviceReplaying = Device == cDevice::PrimaryDevice() && Device->Replaying() && cTransferControl::ReceiverDevice() != cDevice::PrimaryDevice();
if (Device != cDevice::ActualDevice() || (Device->ProvidesTransponderExclusively(Channel) && (IsPrimaryDeviceReplaying || now - lastActivity > Setup.EPGScanTimeout * 3600))) {
if (!IsPrimaryDeviceReplaying && Device == cDevice::ActualDevice() && !currentChannel) {
if (cTransferControl::ReceiverDevice())