summaryrefslogtreecommitdiff
path: root/dvbdevice.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-01-15 14:31:47 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2012-01-15 14:31:47 +0100
commit2d3fa1416f5904ceb0b40a6466b11c619f1db6ad (patch)
tree0a5eaeb3a3607b900f9eb5b26426740cd1bd22fb /dvbdevice.c
parentc36c65416eeac788136b9e2c20484427b3ad8ddf (diff)
downloadvdr-2d3fa1416f5904ceb0b40a6466b11c619f1db6ad.tar.gz
vdr-2d3fa1416f5904ceb0b40a6466b11c619f1db6ad.tar.bz2
Fixed frozen live view with device bonding in case the bonded master is used for live viewing1.7.23
Diffstat (limited to 'dvbdevice.c')
-rw-r--r--dvbdevice.c4
1 files changed, 2 insertions, 2 deletions
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);