From dd7cc838adad330906fd836f5cde39b20373adfb Mon Sep 17 00:00:00 2001
From: schmirl <schmirl>
Date: Wed, 17 Feb 2010 12:39:02 +0000
Subject: switching between two encrypted channels on the same transponder
 didn't always work (thanks to sk8ter@vdrportal)

---
 client/device.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'client')

diff --git a/client/device.c b/client/device.c
index d7a09a6..551d7c2 100644
--- a/client/device.c
+++ b/client/device.c
@@ -1,5 +1,5 @@
 /*
- *  $Id: device.c,v 1.24 2009/10/19 06:19:10 schmirl Exp $
+ *  $Id: device.c,v 1.25 2010/02/17 12:39:03 schmirl Exp $
  */
  
 #include "client/device.h"
@@ -72,7 +72,9 @@ bool cStreamdevDevice::IsTunedToTransponder(const cChannel *Channel)
 {
 	bool res = false;
 	if (ClientSocket.DataSocket(siLive) != NULL
-			&& TRANSPONDER(Channel, m_Channel))
+			&& TRANSPONDER(Channel, m_Channel)
+			&& Channel->Ca() == CA_FTA
+			&& m_Channel->Ca() == CA_FTA)
 		res = true;
 	return res;
 }
@@ -125,7 +127,8 @@ bool cStreamdevDevice::SetChannelDevice(const cChannel *Channel,
 
 	if (ClientSocket.DataSocket(siLive) != NULL 
 			&& TRANSPONDER(Channel, m_Channel)
-			&& Channel->Ca() == m_Channel->Ca())
+			&& Channel->Ca() == CA_FTA
+			&& m_Channel->Ca() == CA_FTA)
 		return true;
 
 	DetachAllReceivers();
-- 
cgit v1.2.3