Command line arguments override config file

1 files changed, 8 insertions, 4 deletions

diff --git a/src/vdr-plugin/webvideo.c b/src/vdr-plugin/webvideo.c
index ab7eaab..9f79c5e 100644
--- a/src/vdr-plugin/webvideo.c
+++ b/src/vdr-plugin/webvideo.c
@@ -135,15 +135,19 @@ bool cPluginWebvideo::Initialize(void)
 
   // default values if not given on the command line
   if ((const char *)destdir == NULL)
-    destdir = cString(VideoDirectory);
+    webvideoConfig->SetDownloadPath(cString(VideoDirectory));
   if ((const char *)conffile == NULL)
     conffile = AddDirectory(ConfigDirectory(Name()), "webvi.plugin.conf");
 
-  webvideoConfig->SetDownloadPath(destdir);
-  webvideoConfig->SetTemplatePath(templatedir);
-  webvideoConfig->SetPostProcessCmd(postprocesscmd);
   webvideoConfig->ReadConfigFile(conffile);
 
+  if ((const char *)destdir)
+    webvideoConfig->SetDownloadPath(destdir);
+  if ((const char *)templatedir)
+    webvideoConfig->SetTemplatePath(templatedir);
+  if ((const char *)postprocesscmd)
+    webvideoConfig->SetPostProcessCmd(postprocesscmd);
+
   cString mymimetypes = AddDirectory(ConfigDirectory(Name()), "mime.types");
   const char *mimefiles [] = {"/etc/mime.types", (const char *)mymimetypes, NULL};
   MimeTypes = new cMimeTypes(mimefiles);