summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY1
-rw-r--r--vdr.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index b28b4121..fd8a2f02 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2323,3 +2323,4 @@ Video Disk Recorder Revision History
Kool for reporting this one).
- Added a note about the config files of plugins to INSTALL (thanks to Thomas
Keil).
+- VDR now continues to start up, even if there is an error in setup.conf.
diff --git a/vdr.c b/vdr.c
index 48ed6277..9c54e3a4 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.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")) &&