1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Fixed a possible crash when stopping VDR (contd)

This commit is contained in:
Klaus Schmidinger 2018-01-27 14:45:08 +01:00
parent 626ae82fee
commit 5443fd4219

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: device.c 4.25 2017/12/16 13:13:13 kls Exp $ * $Id: device.c 4.26 2018/01/27 14:45:08 kls Exp $
*/ */
#include "device.h" #include "device.h"
@ -120,6 +120,7 @@ cDevice::~cDevice()
delete dvbSubtitleConverter; delete dvbSubtitleConverter;
if (this == primaryDevice) if (this == primaryDevice)
primaryDevice = NULL; primaryDevice = NULL;
Cancel(3);
} }
bool cDevice::WaitForAllDevicesReady(int Timeout) bool cDevice::WaitForAllDevicesReady(int Timeout)
@ -1821,7 +1822,7 @@ void cDevice::Detach(cReceiver *Receiver)
} }
} }
if (!receiversLeft) if (!receiversLeft)
Cancel(3); Cancel(-1);
} }
void cDevice::DetachAll(int Pid) void cDevice::DetachAll(int Pid)