From 39ad232ee59bb860fd6f29aeba8067e8ad2a0bdb Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Tue, 19 Feb 2013 09:48:54 +0100
Subject: Now clearing device bondings for devices that don't provide DVB-S in
 the Setup/LNB menu

---
 CONTRIBUTORS | 3 +++
 HISTORY      | 4 +++-
 INSTALL      | 4 ++++
 menu.c       | 4 +++-
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 2871cc61..c7a44785 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2895,6 +2895,9 @@ Juergen Lock <vdr-l@jelal.kn-bremen.de>
  for reporting a problem with EPG scan on systems with only a single DVB device that
  use software output
  for fixing calling iconv_close() only with a valid iconv_t value
+ for reporting a problem with device bondings for devices that don't provide DVB-S
+ in case, for instance, there is now a DVB-T device where there used to be a bonded
+ DVB-S device
 
 Sergiu Dotenco <sergiu.dotenco@googlemail.com>
  for reporting a missing initialization in sDvbSpuRect
diff --git a/HISTORY b/HISTORY
index aeab1ec4..5b059237 100644
--- a/HISTORY
+++ b/HISTORY
@@ -7645,7 +7645,7 @@ Video Disk Recorder Revision History
 - Expanded tabs in PLUGINS/src/dvbhddevice/setup.c.
 - Some formatting fixes.
 
-2013-02-18: Version 1.7.39
+2013-02-19: Version 1.7.39
 
 - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
 - Updated the Polish OSD texts (thanks to Marek Nazarko).
@@ -7655,3 +7655,5 @@ Video Disk Recorder Revision History
 - Updated the Czech OSD texts (thanks to Ales Jurik).
 - Changed the template for PLGCFG to $(CONFDIR)/plugins.mk (thanks to Ville Skyttä).
 - Updated the Swedish OSD texts (thanks to Richard Lithvall).
+- Now clearing device bondings for devices that don't provide DVB-S in the Setup/LNB
+  menu (reported by Juergen Lock).
diff --git a/INSTALL b/INSTALL
index 2cf6be33..bc9193a4 100644
--- a/INSTALL
+++ b/INSTALL
@@ -424,6 +424,10 @@ Note that it doesn't make sense to use "Satellite Channel Routing" and
 of these methods, it is necessary that your devices are always created in the
 same sequence when the drivers are loaded. You may need to configure some
 proper "udev" rules to make sure this happens.
+If you use "Device Bonding" and you add devices to your setup that don't
+provide DVB-S and take up a position in which there used to be a bonded DVB-S
+device, make sure you open, adjust (if necessary) and confirm the Setup/LNB
+menu to have the device bondings set correctly again.
 
 Running VDR with DVB-C (cable) or DVB-T (terrestrial):
 ------------------------------------------------------
diff --git a/menu.c b/menu.c
index 69fe6d50..4db68ec7 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 2.79 2013/02/17 13:17:49 kls Exp $
+ * $Id: menu.c 2.80 2013/02/19 09:33:26 kls Exp $
  */
 
 #include "menu.h"
@@ -2965,6 +2965,8 @@ void cMenuSetupLNB::Setup(void)
      for (int i = 0; i < cDevice::NumDevices(); i++) {
          if (cDevice::GetDevice(i)->ProvidesSource(cSource::stSat))
             Add(new cMenuEditIntItem(cString::sprintf(tr("Setup.LNB$Device %d connected to sat cable"), i + 1), &satCableNumbers.Array()[i], 0, NumSatDevices, tr("Setup.LNB$own")));
+         else
+            satCableNumbers.Array()[i] = 0;
          }
      }
 
-- 
cgit v1.2.3