summaryrefslogtreecommitdiff
path: root/ci.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2014-01-14 12:21:17 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2014-01-14 12:21:17 +0100
commite7c86c676017a75f4c3d522a341ed95057be6820 (patch)
treeb000472c7281fc31d0152cc7f648d8a3684bc133 /ci.c
parentdbf342df3c401cfc4cd4d5df28c98c175ba252bc (diff)
downloadvdr-e7c86c676017a75f4c3d522a341ed95057be6820.tar.gz
vdr-e7c86c676017a75f4c3d522a341ed95057be6820.tar.bz2
Improved locking for CAM slots and made the pure functions of cCiAdapter have default implementations
Diffstat (limited to 'ci.c')
-rw-r--r--ci.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ci.c b/ci.c
index e2881fed..56a4583e 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: ci.c 3.4 2014/01/02 10:31:12 kls Exp $
+ * $Id: ci.c 3.5 2014/01/14 12:03:37 kls Exp $
*/
#include "ci.h"
@@ -1584,6 +1584,8 @@ cCamSlot::cCamSlot(cCiAdapter *CiAdapter, bool ReceiveCaPids)
cCamSlot::~cCamSlot()
{
+ if (ciAdapter && ciAdapter->assignedDevice)
+ ciAdapter->assignedDevice->SetCamSlot(NULL);
delete caPidReceiver;
CamSlots.Del(this, false);
DeleteAllConnections();