diff options
| -rw-r--r-- | HISTORY | 4 | ||||
| -rw-r--r-- | dvbdevice.c | 4 |
2 files changed, 5 insertions, 3 deletions
@@ -6960,7 +6960,7 @@ Video Disk Recorder Revision History which was made in version 1.1.10, so please report if this has any unwanted side effects. -2012-03-06: Version 1.7.26 +2012-03-07: Version 1.7.26 - Now checking for NULL in cOsd::AddPixmap() (suggested by Christoph Haubrich). - Fixed the German translation of "VDR will shut down in %s minutes" (thanks to @@ -6979,3 +6979,5 @@ Video Disk Recorder Revision History - Fixed switching devices to the transponders of VPS recordings in case there are only bonded devices. The cDevice's "avoid device" mechanism has been replaced by using "occupied". +- Fixed selecting devices for the EPG scan in case the primary device is bonded + with an other one. diff --git a/dvbdevice.c b/dvbdevice.c index 1987223e..ce45ba51 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.65 2012/02/29 12:23:43 kls Exp $ + * $Id: dvbdevice.c 2.66 2012/03/07 13:37:01 kls Exp $ */ #include "dvbdevice.h" @@ -420,7 +420,7 @@ bool cDvbTuner::BondingOk(const cChannel *Channel, bool ConsiderOccupied) const if (cDvbTuner *t = bondedTuner) { cString BondingParams = GetBondingParams(Channel); do { - if (t->device->Receiving() || ConsiderOccupied && t->device->Occupied()) { + if (t->device->Priority() > IDLEPRIORITY || ConsiderOccupied && t->device->Occupied()) { if (strcmp(BondingParams, t->GetBondingParams()) != 0) return false; } |