summaryrefslogtreecommitdiff
path: root/device.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-08-31 11:02:24 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2012-08-31 11:02:24 +0200
commitd3b3c43e8f0f584fc679787edc8799399f8e8d3e (patch)
tree25f59092e4a27a8976e9a7ebbc21aac15d0874d3 /device.c
parent5d0410de3e73dacbc96f7e1919d8ea83c8368e68 (diff)
downloadvdr-d3b3c43e8f0f584fc679787edc8799399f8e8d3e.tar.gz
vdr-d3b3c43e8f0f584fc679787edc8799399f8e8d3e.tar.bz2
Fixed a race condition when zapping in transfer mode (cont'd)
Diffstat (limited to 'device.c')
-rw-r--r--device.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/device.c b/device.c
index 0f667718..a5a0ec78 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: device.c 2.65 2012/08/26 13:45:38 kls Exp $
+ * $Id: device.c 2.66 2012/08/31 11:02:24 kls Exp $
*/
#include "device.h"
@@ -1675,8 +1675,8 @@ void cDevice::Detach(cReceiver *Receiver)
cMutexLock MutexLock(&mutexReceiver);
for (int i = 0; i < MAXRECEIVERS; i++) {
if (receiver[i] == Receiver) {
- Receiver->Activate(false);
Lock();
+ Receiver->Activate(false);
receiver[i] = NULL;
Receiver->device = NULL;
Unlock();