frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed a crash when stopping VDR while recording encrypted channels with MTD

This commit is contained in:
Klaus Schmidinger 2017-03-25 14:09:31 +01:00
parent 2d9eb7e25d
commit fe57c16f6f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ci.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #include "ci.h"
@ -1854,8 +1854,7 @@ cCamSlot::cCamSlot(cCiAdapter *CiAdapter, bool WantsTsData, cCamSlot *MasterSlot
cCamSlot::~cCamSlot() cCamSlot::~cCamSlot()
{ {
if (assignedDevice) Assign(NULL);
assignedDevice->SetCamSlot(NULL);
delete caPidReceiver; delete caPidReceiver;
delete caActivationReceiver; delete caActivationReceiver;
CamSlots.Del(this, false); CamSlots.Del(this, false);

3
mtd.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * 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" #include "mtd.h"
@ -235,6 +235,7 @@ cMtdCamSlot::cMtdCamSlot(cCamSlot *MasterSlot, int Index)
cMtdCamSlot::~cMtdCamSlot() cMtdCamSlot::~cMtdCamSlot()
{ {
Assign(NULL);
delete mtdMapper; delete mtdMapper;
delete mtdBuffer; delete mtdBuffer;
} }