summaryrefslogtreecommitdiff
path: root/vdr.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2010-01-31 12:59:50 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2010-01-31 12:59:50 +0100
commit86291b620532968421d9ad46a5276e1e9761570c (patch)
treee24fe972bf60a4e575c39b0e5ca43bc36fe52b64 /vdr.c
parent08899602322175a6cb080951c2ad0dcbf71446fa (diff)
downloadvdr-e141fc2560411d484b56bdb6fef0b031b7204694.tar.gz
vdr-e141fc2560411d484b56bdb6fef0b031b7204694.tar.bz2
The files "commands.conf" and "reccmd.conf" can now contain nested lists of commands1.7.12
Diffstat (limited to 'vdr.c')
-rw-r--r--vdr.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/vdr.c b/vdr.c
index 38a29544..e0773015 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
*
* The project's page is at http://www.tvdr.de
*
- * $Id: vdr.c 2.15 2010/01/16 15:11:13 kls Exp $
+ * $Id: vdr.c 2.16 2010/01/31 11:14:40 kls Exp $
*/
#include <getopt.h>
@@ -582,8 +582,8 @@ int main(int argc, char *argv[])
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);
- RecordingCommands.Load(AddDirectory(ConfigDirectory, "reccmds.conf"), true);
+ Commands.Load(AddDirectory(ConfigDirectory, "commands.conf"));
+ RecordingCommands.Load(AddDirectory(ConfigDirectory, "reccmds.conf"));
SVDRPhosts.Load(AddDirectory(ConfigDirectory, "svdrphosts.conf"), true);
Keys.Load(AddDirectory(ConfigDirectory, "remote.conf"));
KeyMacros.Load(AddDirectory(ConfigDirectory, "keymacros.conf"), true);