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

Fixed a deadlock

This commit is contained in:
Klaus Schmidinger 2014-01-21 11:12:01 +01:00
parent 6e2f0f695f
commit 838566ea41
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
device.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: device.c 3.10 2014/01/20 11:53:47 kls Exp $ * $Id: device.c 3.11 2014/01/21 11:12:01 kls Exp $
*/ */
#include "device.h" #include "device.h"
@ -1579,7 +1579,6 @@ void cDevice::Action(void)
while (Running()) { while (Running()) {
// Read data from the DVR device: // Read data from the DVR device:
uchar *b = NULL; uchar *b = NULL;
LOCK_THREAD;
if (GetTSPacket(b)) { if (GetTSPacket(b)) {
if (b) { if (b) {
int Pid = TsPid(b); int Pid = TsPid(b);
@ -1604,6 +1603,7 @@ void cDevice::Action(void)
} }
} }
// Distribute the packet to all attached receivers: // Distribute the packet to all attached receivers:
Lock();
for (int i = 0; i < MAXRECEIVERS; i++) { for (int i = 0; i < MAXRECEIVERS; i++) {
if (receiver[i] && receiver[i]->WantsPid(Pid)) { if (receiver[i] && receiver[i]->WantsPid(Pid)) {
if (DetachReceivers) { if (DetachReceivers) {
@ -1616,6 +1616,7 @@ void cDevice::Action(void)
ChannelCamRelations.SetDecrypt(receiver[i]->ChannelID(), CamSlotNumber); ChannelCamRelations.SetDecrypt(receiver[i]->ChannelID(), CamSlotNumber);
} }
} }
Unlock();
} }
} }
else else