Fixed a possible "Channel not available" if a recording starts on a system with bonded devices

This commit is contained in:
Klaus Schmidinger 2013-03-12 10:18:55 +01:00
parent 7100e4c209
commit a8ae0d2f7c
3 changed files with 8 additions and 2 deletions

View File

@ -3113,3 +3113,7 @@ Dominique Plu <dplu@free.fr>
Matti Lehtimäki <matti.lehtimaki@gmail.com>
for translating OSD texts to the Finnish language
Siegfried Bosch <bosch@math.uni-muenster.de>
for fixing a possible "Channel not available" if a recording starts on a system with
bonded devices

View File

@ -7742,3 +7742,5 @@ Video Disk Recorder Revision History
of the plugin source.
- The parameters PATH and NAME to the --dirnames command line option may now be left
empty to use the default values if only ENC shall be set.
- Fixed a possible "Channel not available" if a recording starts on a system with
bonded devices (thanks to Siegfried Bosch).

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: dvbdevice.c 2.84 2013/03/07 09:42:29 kls Exp $
* $Id: dvbdevice.c 2.85 2013/03/12 10:08:34 kls Exp $
*/
#include "dvbdevice.h"
@ -426,7 +426,7 @@ bool cDvbTuner::BondingOk(const cChannel *Channel, bool ConsiderOccupied) const
cString BondingParams = GetBondingParams(Channel);
do {
if (t->device->Priority() > IDLEPRIORITY || ConsiderOccupied && t->device->Occupied()) {
if (strcmp(BondingParams, t->GetBondingParams()) != 0)
if (strcmp(BondingParams, t->GetBondedMaster()->GetBondingParams()) != 0)
return false;
}
t = t->bondedTuner;