summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY4
-rw-r--r--dvbdevice.c6
2 files changed, 6 insertions, 4 deletions
diff --git a/HISTORY b/HISTORY
index 749b0eb6..fe486796 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6836,7 +6836,7 @@ Video Disk Recorder Revision History
- Fixed frozen live view with device bonding in case the bonded master is used for
live viewing (reported by Uwe Scheffler).
-2012-02-11: Version 1.7.24
+2012-02-12: Version 1.7.24
- Updated the Italian OSD texts (thanks to Diego Pierotto).
- Fixed a high load in case a transponder can't be received.
@@ -6853,3 +6853,5 @@ Video Disk Recorder Revision History
Sundararaj Reel).
- The epg.data file is now read in a separate thread to make the startup process
faster in case the file is very large (suggested by Helmut Auer).
+- Fixed selecting the primary device for receiving the live viewing channel in
+ case it is bonded with an other device and has no receiver attached to it.
diff --git a/dvbdevice.c b/dvbdevice.c
index 62f7c753..2966ef33 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.59 2012/01/17 15:16:12 kls Exp $
+ * $Id: dvbdevice.c 2.60 2012/02/12 12:38:49 kls Exp $
*/
#include "dvbdevice.h"
@@ -1442,7 +1442,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
}
else
- needsDetachReceivers = true;
+ needsDetachReceivers = Receiving(true);
}
if (result) {
if (!BondingOk(Channel)) {
@@ -1454,7 +1454,7 @@ bool cDvbDevice::ProvidesChannel(const cChannel *Channel, int Priority, bool *Ne
}
}
needsDetachBondedReceivers = true;
- needsDetachReceivers = true;
+ needsDetachReceivers = Receiving(true);
}
}
}