diff options
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | dvbdevice.c | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index fc5ee499..2a3d8588 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -271,6 +271,7 @@ Uwe Scheffler <linux_dvb@uni.de> for his help in keeping 'channels.conf.cable' and 'channels.conf.terr' up to date for helping to test new DVB-T handling for reporting a bug in switching the video format in the Setup/DVB menu + for reporting a problem with frozen live view in conjunction with device bonding Matjaz Thaler <matjaz.thaler@guest.arnes.si> for improving AC3 decoding when replaying DVDs @@ -6833,3 +6833,5 @@ Video Disk Recorder Revision History replayed. - Fixed wrongfully displaying the length of a recording in the title of the replay progress display. +- Fixed frozen live view with device bonding in case the bonded master is used for + live viewing (reported by Uwe Scheffler). diff --git a/dvbdevice.c b/dvbdevice.c index 80bbb010..39153970 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.55 2012/01/14 10:45:33 kls Exp $ + * $Id: dvbdevice.c 2.56 2012/01/15 14:31:47 kls Exp $ */ #include "dvbdevice.h" @@ -487,7 +487,7 @@ void cDvbTuner::SetChannel(const cChannel *Channel) t->SetChannel(NULL); } } - else if (!BondedMaster->device->Receiving()) + else if (strcmp(GetBondingParams(Channel), BondedMaster->GetBondingParams()) != 0) BondedMaster->SetChannel(Channel); } cMutexLock MutexLock(&mutex); |