summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2013-03-12 10:18:55 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2013-03-12 10:18:55 +0100
commita8ae0d2f7c16ccd40bba68e32429d34cd2cb610d (patch)
treee5dc9b897fb002650e5b3667e7ffaaf0f2ecb41c
parent7100e4c209ce2433359362ab7bb3209ceac027c0 (diff)
downloadvdr-a8ae0d2f7c16ccd40bba68e32429d34cd2cb610d.tar.gz
vdr-a8ae0d2f7c16ccd40bba68e32429d34cd2cb610d.tar.bz2
Fixed a possible "Channel not available" if a recording starts on a system with bonded devices
-rw-r--r--CONTRIBUTORS4
-rw-r--r--HISTORY2
-rw-r--r--dvbdevice.c4
3 files changed, 8 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2c9e2380..8490ca33 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -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
diff --git a/HISTORY b/HISTORY
index 489c61a6..00e74a84 100644
--- a/HISTORY
+++ b/HISTORY
@@ -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).
diff --git a/dvbdevice.c b/dvbdevice.c
index cd017a2d..0ec29ae9 100644
--- a/dvbdevice.c
+++ b/dvbdevice.c
@@ -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;