frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed stopping an ongoing recording on a system with bonded devices, if a timer with a higher priority requires a different band (cont'd)

Browse Source
This commit is contained in:
Klaus Schmidinger 2013-03-13 11:23:53 +01:00
parent 4118097e73
commit 1b61b7f5bc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dvbdevice.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: dvbdevice.c 2.86 2013/03/12 11:43:29 kls Exp $ * $Id: dvbdevice.c 2.87 2013/03/13 11:23:53 kls Exp $
*/ */
#include "dvbdevice.h" #include "dvbdevice.h"
@ -1485,6 +1485,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
needsDetachReceivers = Receiving(); needsDetachReceivers = Receiving();
} }
if (result) { if (result) {
cMutexLock MutexLock(&bondMutex);
if (!BondingOk(Channel)) { if (!BondingOk(Channel)) {
// This device is bonded, so we need to check the priorities of the others: // This device is bonded, so we need to check the priorities of the others:
for (cDvbDevice *d = bondedDevice; d && d != this; d = d->bondedDevice) { for (cDvbDevice *d = bondedDevice; d && d != this; d = d->bondedDevice) {
@ -1492,9 +1493,10 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
result = false; result = false;
break; break;
} }
needsDetachReceivers |= d->Receiving();
} }
needsDetachBondedReceivers = true; needsDetachBondedReceivers = true;
needsDetachReceivers = true; needsDetachReceivers |= Receiving();
} }
} }
} }