summaryrefslogtreecommitdiff
path: root/device.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2014-01-01 12:37:22 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2014-01-01 12:37:22 +0100
commit566c6fa4641ea116307cfb5e40d151a104ab1490 (patch)
tree4d541f4e23394b252898ab302be48bfb59fd5463 /device.c
parentb95b85fee4a7c26bfbc2890ac3ff00cef5fa0388 (diff)
downloadvdr-566c6fa4641ea116307cfb5e40d151a104ab1490.tar.gz
vdr-566c6fa4641ea116307cfb5e40d151a104ab1490.tar.bz2
Added receiving Ca pids to cCamSlot
Diffstat (limited to 'device.c')
-rw-r--r--device.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/device.c b/device.c
index c9a70173..4db3ddd7 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 3.5 2013/12/28 12:56:24 kls Exp $
+ * $Id: device.c 3.6 2014/01/01 11:51:17 kls Exp $
*/
#include "device.h"
@@ -1666,7 +1666,7 @@ bool cDevice::AttachReceiver(cReceiver *Receiver)
Receiver->device = this;
receiver[i] = Receiver;
Unlock();
- if (camSlot) {
+ if (camSlot && Receiver->priority > MINPRIORITY) { // priority check to avoid an infinite loop with the CAM slot's caPidReceiver
camSlot->StartDecrypting();
startScrambleDetection = time(NULL);
}
@@ -1697,7 +1697,7 @@ void cDevice::Detach(cReceiver *Receiver)
else if (receiver[i])
receiversLeft = true;
}
- if (camSlot)
+ if (camSlot && Receiver->priority > MINPRIORITY) // priority check to avoid an infinite loop with the CAM slot's caPidReceiver
camSlot->StartDecrypting();
if (!receiversLeft)
Cancel(-1);