From 2a2919d053b392b04e6d8122114bd34cf2a1b22e Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sat, 20 Jan 2001 09:51:51 +0100
Subject: Fixed 'Transfer Mode' to check for primary interface

---
 HISTORY  | 6 ++++++
 dvbapi.c | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/HISTORY b/HISTORY
index 8d5e8849..abbedfe9 100644
--- a/HISTORY
+++ b/HISTORY
@@ -349,3 +349,9 @@ Video Disk Recorder Revision History
 - The EIT scanning thread is now locked when switching channels to avoid problems.
 - Encrypted channels can now be selected even without knowing the PNR (however, it
   is still necessary for the EPG info).
+
+2001-01-20: Version 0.71
+
+- Fixed 'Transfer Mode' in cases where a non-primary interface was switched to
+  a channel that only the primary interface can receive (which could happen in
+  the EPG scanner).
diff --git a/dvbapi.c b/dvbapi.c
index e583baf9..ba0894d7 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.50 2001/01/18 19:53:54 kls Exp $
+ * $Id: dvbapi.c 1.51 2001/01/20 09:51:51 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -2198,7 +2198,7 @@ bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization,
         currentChannel = ChannelNumber;
         // If this DVB card can't receive this channel, let's see if we can
         // use the card that actually can receive it and transfer data from there:
-        if (Ca && Ca != Index() + 1) {
+        if (this == PrimaryDvbApi && Ca && Ca != Index() + 1) {
            cDvbApi *CaDvbApi = GetDvbApi(Ca, 0);
            if (CaDvbApi) {
               if (!CaDvbApi->Recording()) {
-- 
cgit v1.2.3