No Diseqc command if parameter is '0'

3 files changed, 9 insertions, 2 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 6070fe81..8f7d4223 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -81,3 +81,7 @@ Henning Holtschneider <hh@holtschneider.com>
 
 Paulo Manuel Martins Lopes <pmml@netvita.pt>
  for translating the OSD texts to the Portugese language
+
+Markus Lang <markus.lang@nissan-db.de> and Ulrich Röder
+ for patching the Diseqc code so that it doesn't send a Diseqc command if
+ the Diseqc value for a given channel is '0'.
diff --git a/HISTORY b/HISTORY
index bac0697b..06b21fec 100644
--- a/HISTORY
+++ b/HISTORY
@@ -541,3 +541,6 @@ Video Disk Recorder Revision History
 - Added an additional "emergency exit" in case channel switching doesn't
   work several times in a row (when will the driver finally become stable
   enough to allow rock solid channel switching??).
+- No longer sending a Diseqc command if the Diseqc value for a given channel
+  is '0'. Previously this caused problems with some multi-switches (thanks to
+  Markus Lang and Ulrich Röder).
diff --git a/dvbapi.c b/dvbapi.c
index 45a526b4..6bf21786 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbapi.c 1.82 2001/06/27 11:34:17 kls Exp $
+ * $Id: dvbapi.c 1.83 2001/07/12 12:23:29 kls Exp $
  */
 
 #include "dvbapi.h"
@@ -2166,7 +2166,7 @@ bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization,
      scmds.voltage = volt;
      scmds.miniCommand = SEC_MINI_NONE;
      scmds.continuousTone = tone;
-     scmds.numCommands = 1;
+     scmds.numCommands = Diseqc ? 1 : 0;
      scmds.commands = &scmd;
 
      CHECK(ioctl(fd_sec, SEC_SEND_SEQUENCE, &scmds));