Fixed handling the '-E' option

3 files changed, 8 insertions, 2 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 65674af8..f45912eb 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -791,6 +791,7 @@ Benjamin Harling <benjamin.harling@web.de>
 
 Christian Jacobsen <christian.jacobsen@stageholding.de>
  for making the LIRC interface skip keys that come in too fast
+ for reporting a problem in handling the '-E' options in version 1.3.18
 
 Andreas Mair <Andreas.Mair@linogate.com>
  for reporting a short display of the main menu if a plugin displays its own OSD and
diff --git a/HISTORY b/HISTORY
index 0f94df8f..0075071e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3303,3 +3303,5 @@ Video Disk Recorder Revision History
   this one).
 - The "Green" button in the "Main" menu is now always "Audio", since the audio
   channel might be changed even if there is only one actual audio PID.
+- Fixed handling the '-E' option which was broken in version 1.3.18 (thanks to
+  Christian Jacobsen for reporting this one).
diff --git a/vdr.c b/vdr.c
index 2089d961..d1f8c4ae 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.199 2005/01/09 16:35:36 kls Exp $
+ * $Id: vdr.c 1.200 2005/01/14 16:50:39 kls Exp $
  */
 
 #include <getopt.h>
@@ -412,7 +412,10 @@ int main(int argc, char *argv[])
         }
      else if (*EpgDataFileName != '/' && *EpgDataFileName != '.')
         EpgDirectory = VideoDirectory;
-     cSchedules::SetEpgDataFileName(AddDirectory(EpgDirectory, EpgDataFileName));
+     if (EpgDirectory)
+        cSchedules::SetEpgDataFileName(AddDirectory(EpgDirectory, EpgDataFileName));
+     else
+        cSchedules::SetEpgDataFileName(EpgDataFileName);
      cSchedules::Read();
      }