summaryrefslogtreecommitdiff
path: root/vdr.c
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2010-01-17 12:08:03 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2010-01-17 12:08:03 +0100
commita503c6ab3f1763c98db5677a59d4d07bf8299025 (patch)
tree8c041b2e26b1453151f73927cdb3dacbe10b2f50 /vdr.c
parent61c1df70040cbb9215f9735be36cf414b039a2e6 (diff)
downloadvdr-a503c6ab3f1763c98db5677a59d4d07bf8299025.tar.gz
vdr-a503c6ab3f1763c98db5677a59d4d07bf8299025.tar.bz2
The "Edit timer" menu can now set the folder for the recording from a list of folders stored in "folders.conf"
Diffstat (limited to 'vdr.c')
-rw-r--r--vdr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/vdr.c b/vdr.c
index e1bfc16a..38a29544 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.14 2010/01/02 11:52:40 kls Exp $
+ * $Id: vdr.c 2.15 2010/01/16 15:11:13 kls Exp $
*/
#include <getopt.h>
@@ -587,6 +587,7 @@ int main(int argc, char *argv[])
SVDRPhosts.Load(AddDirectory(ConfigDirectory, "svdrphosts.conf"), true);
Keys.Load(AddDirectory(ConfigDirectory, "remote.conf"));
KeyMacros.Load(AddDirectory(ConfigDirectory, "keymacros.conf"), true);
+ Folders.Load(AddDirectory(ConfigDirectory, "folders.conf"));
if (!*cFont::GetFontFileName(Setup.FontOsd)) {
const char *msg = "no fonts available - OSD will not show any text!";