summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ci.c5
-rw-r--r--mtd.c3
2 files changed, 4 insertions, 4 deletions
diff --git a/ci.c b/ci.c
index a788781b..71623d88 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 4.8 2017/03/23 14:30:56 kls Exp $
+ * $Id: ci.c 4.9 2017/03/25 14:09:23 kls Exp $
*/
#include "ci.h"
@@ -1854,8 +1854,7 @@ cCamSlot::cCamSlot(cCiAdapter *CiAdapter, bool WantsTsData, cCamSlot *MasterSlot
cCamSlot::~cCamSlot()
{
- if (assignedDevice)
- assignedDevice->SetCamSlot(NULL);
+ Assign(NULL);
delete caPidReceiver;
delete caActivationReceiver;
CamSlots.Del(this, false);
diff --git a/mtd.c b/mtd.c
index a09f0162..2fa55626 100644
--- a/mtd.c
+++ b/mtd.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: mtd.c 1.4 2017/03/23 14:34:53 kls Exp $
+ * $Id: mtd.c 1.5 2017/03/25 14:09:31 kls Exp $
*/
#include "mtd.h"
@@ -235,6 +235,7 @@ cMtdCamSlot::cMtdCamSlot(cCamSlot *MasterSlot, int Index)
cMtdCamSlot::~cMtdCamSlot()
{
+ Assign(NULL);
delete mtdMapper;
delete mtdBuffer;
}