Fixed detecting transfer mode on full featured DVB cards

3 files changed, 6 insertions, 2 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7ae8fb8a..f83683fa 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -225,6 +225,8 @@ Stefan Huelswitt <huels@iname.com>
  cStatus::MsgSetVolume() bug to react properly
  for improving the 'i18n' target in the Makefile to avoid unnecessary work
  for a patch that was used to implement the --localedir option
+ for reporting a problem with updating CA descriptors in transfer mode on full
+ featured DVB cards
 
 Ulrich Röder <roeder@efr-net.de>
  for pointing out that there are channels that have a symbol rate higher than 27500
diff --git a/HISTORY b/HISTORY
index e275b9de..94eea630 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7203,3 +7203,5 @@ Video Disk Recorder Revision History
   no other files. This fixes the leftover ".sort" files that were introduced in
   version 1.7.29.
 - Added IsUpdate() to the EPG handler interface (thanks to Jörg Wendel).
+- Fixed detecting transfer mode on full featured DVB cards (thanks to Stefan Huelswitt
+  for reporting a problem with updating CA descriptors in such cases).
diff --git a/device.c b/device.c
index 872b1aa9..e3ea677f 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: device.c 2.62 2012/06/10 13:13:18 kls Exp $
+ * $Id: device.c 2.63 2012/08/25 11:56:08 kls Exp $
  */
 
 #include "device.h"
@@ -1195,7 +1195,7 @@ bool cDevice::Replaying(void) const
 
 bool cDevice::Transferring(void) const
 {
-  return ActualDevice() != PrimaryDevice();
+  return cTransferControl::ReceiverDevice() != NULL;
 }
 
 bool cDevice::AttachPlayer(cPlayer *Player)