summaryrefslogtreecommitdiff
path: root/vdr.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2003-09-14 09:38:44 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2003-09-14 09:38:44 +0200
commit07bc699dca7e9cedf2cd1255765f0d0b661c3a97 (patch)
tree3f391121e36c85783b9981a8464cabc11f8f3225 /vdr.c
parentac4393b866b55c85b0357c7fd387311d594adf2b (diff)
downloadvdr-07bc699dca7e9cedf2cd1255765f0d0b661c3a97.tar.gz
vdr-07bc699dca7e9cedf2cd1255765f0d0b661c3a97.tar.bz2
Made 'diseqc.conf' a required file only if Setup.DiSEqC is activated
Diffstat (limited to 'vdr.c')
-rw-r--r--vdr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vdr.c b/vdr.c
index cdc460ea..e4874afc 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.cadsoft.de/vdr
*
- * $Id: vdr.c 1.168 2003/09/05 13:14:16 kls Exp $
+ * $Id: vdr.c 1.169 2003/09/14 09:36:54 kls Exp $
*/
#include <getopt.h>
@@ -346,7 +346,7 @@ int main(int argc, char *argv[])
Setup.Load(AddDirectory(ConfigDirectory, "setup.conf"));
if (!(Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true) &&
- Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, true) &&
+ Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, Setup.DiSEqC) &&
Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"), false, true) &&
Timers.Load(AddDirectory(ConfigDirectory, "timers.conf")) &&
Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"), true) &&