frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

VDR now continues to start up, even if there is an error in setup.conf

Browse Source
This commit is contained in:
Klaus Schmidinger 2003-08-24 11:19:13 +02:00
parent 76e1427bde
commit ca39b3f03a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -2323,3 +2323,4 @@ Video Disk Recorder Revision History
Kool for reporting this one). Kool for reporting this one).
- Added a note about the config files of plugins to INSTALL (thanks to Thomas - Added a note about the config files of plugins to INSTALL (thanks to Thomas
Keil). Keil).
- VDR now continues to start up, even if there is an error in setup.conf.

6
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.cadsoft.de/vdr * 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> #include <getopt.h>
@ -340,8 +340,8 @@ int main(int argc, char *argv[])
cPlugin::SetConfigDirectory(ConfigDirectory); cPlugin::SetConfigDirectory(ConfigDirectory);
if (!(Setup.Load(AddDirectory(ConfigDirectory, "setup.conf")) && Setup.Load(AddDirectory(ConfigDirectory, "setup.conf"));
Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true) && if (!(Sources.Load(AddDirectory(ConfigDirectory, "sources.conf"), true, true) &&
Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, true) && Diseqcs.Load(AddDirectory(ConfigDirectory, "diseqc.conf"), true, true) &&
Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"), false, true) && Channels.Load(AddDirectory(ConfigDirectory, "channels.conf"), false, true) &&
Timers.Load(AddDirectory(ConfigDirectory, "timers.conf")) && Timers.Load(AddDirectory(ConfigDirectory, "timers.conf")) &&