summaryrefslogtreecommitdiff
path: root/device.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-09-02 09:35:31 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2012-09-02 09:35:31 +0200
commit378a05a96d797eb87be04dc9473a1e5562a32d4e (patch)
tree9d8a82bcf00daee9f091a8e76afcb2deeeaf4e7d /device.c
parent13edfc13820efc784c08b7b93e73f34a73c1e80e (diff)
downloadvdr-378a05a96d797eb87be04dc9473a1e5562a32d4e.tar.gz
vdr-378a05a96d797eb87be04dc9473a1e5562a32d4e.tar.bz2
Changed the semantics of the cReceiver::Activate() function (it is now called with 'false' *after* the receiver has been detached from the device
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 a5a0ec78..6518e820 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.66 2012/08/31 11:02:24 kls Exp $
+ * $Id: device.c 2.67 2012/09/02 09:26:36 kls Exp $
*/
#include "device.h"
@@ -1676,10 +1676,10 @@ void cDevice::Detach(cReceiver *Receiver)
for (int i = 0; i < MAXRECEIVERS; i++) {
if (receiver[i] == Receiver) {
Lock();
- Receiver->Activate(false);
receiver[i] = NULL;
Receiver->device = NULL;
Unlock();
+ Receiver->Activate(false);
for (int n = 0; n < Receiver->numPids; n++)
DelPid(Receiver->pids[n]);
}