summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY3
-rw-r--r--dvbdevice.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index 2b8f2934..34d0e215 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6781,6 +6781,7 @@ Video Disk Recorder Revision History
- Replaced all calls to sleep() with cCondWait::SleepMs() (thanks to Rolf Ahrenberg).
- Fixed a crash with malformed SI data (patch from vdr-portal).
-2011-12-04: Version 1.7.23
+2011-12-10: Version 1.7.23
- Removed the '.pl' suffix from svdrpsend.pl (sorry, I missed that one).
+- Fixed bonding more than two devices.
diff --git a/dvbdevice.c b/dvbdevice.c
index 163fce36..351609f8 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.48 2011/12/03 15:24:27 kls Exp $
+ * $Id: dvbdevice.c 2.49 2011/12/06 17:38:18 kls Exp $
*/
#include "dvbdevice.h"
@@ -1126,7 +1126,7 @@ bool cDvbDevice::BondDevices(const char *Bondings)
if (cDevice *Device2 = cDevice::GetDevice(d)) {
if (cDvbDevice *DvbDevice1 = dynamic_cast<cDvbDevice *>(Device1)) {
if (cDvbDevice *DvbDevice2 = dynamic_cast<cDvbDevice *>(Device2)) {
- if (!DvbDevice2->Bond(DvbDevice1))
+ if (!DvbDevice1->Bond(DvbDevice2))
return false; // Bond() has already logged the error
}
else