frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed handling the '-E' option

This commit is contained in:
Klaus Schmidinger 2005-01-14 16:55:28 +01:00
parent 1d1b2f1275
commit 00187ff97c
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -791,6 +791,7 @@ Benjamin Harling <benjamin.harling@web.de>
Christian Jacobsen <christian.jacobsen@stageholding.de> Christian Jacobsen <christian.jacobsen@stageholding.de>
for making the LIRC interface skip keys that come in too fast 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> Andreas Mair <Andreas.Mair@linogate.com>
for reporting a short display of the main menu if a plugin displays its own OSD and for reporting a short display of the main menu if a plugin displays its own OSD and

2
HISTORY
View File

@ -3303,3 +3303,5 @@ Video Disk Recorder Revision History
this one). this one).
- The "Green" button in the "Main" menu is now always "Audio", since the audio - 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. 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).

7
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.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> #include <getopt.h>
@ -412,7 +412,10 @@ int main(int argc, char *argv[])
} }
else if (*EpgDataFileName != '/' && *EpgDataFileName != '.') else if (*EpgDataFileName != '/' && *EpgDataFileName != '.')
EpgDirectory = VideoDirectory; EpgDirectory = VideoDirectory;
cSchedules::SetEpgDataFileName(AddDirectory(EpgDirectory, EpgDataFileName)); if (EpgDirectory)
cSchedules::SetEpgDataFileName(AddDirectory(EpgDirectory, EpgDataFileName));
else
cSchedules::SetEpgDataFileName(EpgDataFileName);
cSchedules::Read(); cSchedules::Read();
} }