diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2003-08-24 11:19:13 +0200 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2003-08-24 11:19:13 +0200 |
| commit | ca39b3f03a0393b0c241a9ebc4b0d5e14fbc00b0 (patch) | |
| tree | 11b5b4f33f9812a1fb88d901315fc22e17e386aa /vdr.c | |
| parent | 76e1427bde9ac5977695bab843720507ddb4d1bb (diff) | |
| download | vdr-ca39b3f03a0393b0c241a9ebc4b0d5e14fbc00b0.tar.gz vdr-ca39b3f03a0393b0c241a9ebc4b0d5e14fbc00b0.tar.bz2 | |
VDR now continues to start up, even if there is an error in setup.conf
Diffstat (limited to 'vdr.c')
| -rw-r--r-- | vdr.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/vdr * - * $Id: vdr.c 1.165 2003/08/17 08:50:25 kls Exp $ + * $Id: vdr.c 1.166 2003/08/24 11:18:04 kls Exp $ */ #include <getopt.h> @@ -340,8 +340,8 @@ int main(int argc, char *argv[]) cPlugin::SetConfigDirectory(ConfigDirectory); - if (!(Setup.Load(AddDirectory(ConfigDirectory, "setup.conf")) && - Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true) && + Setup.Load(AddDirectory(ConfigDirectory, "setup.conf")); + if (!(Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true) && Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, true) && Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"), false, true) && Timers.Load(AddDirectory(ConfigDirectory, "timers.conf")) && |