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

Fixed setting the name of the video directory to avoid a crash when using --genindex, and also to use the correct directory with --edit

This commit is contained in:
Klaus Schmidinger 2013-12-25 11:36:44 +01:00
parent 31e334a332
commit b936cb366f
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -2149,6 +2149,7 @@ Marko M
for fixing a missing initialization in the c'tor of cSkinLCARSDisplayChannel for fixing a missing initialization in the c'tor of cSkinLCARSDisplayChannel
for suggesting to simplify some conditional expressions in skinlcars.c and skinsttng.c for suggesting to simplify some conditional expressions in skinlcars.c and skinsttng.c
for reporting some uninitialized item area coordinates in cSkinLCARSDisplayMenu for reporting some uninitialized item area coordinates in cSkinLCARSDisplayMenu
for reporting a problem with the video directory not being set correctly with --edit
Patrick Rother <krd-vdr@gulu.net> Patrick Rother <krd-vdr@gulu.net>
for reporting a bug in defining timers that only differ in the day of week for reporting a bug in defining timers that only differ in the day of week

5
HISTORY
View File

@ -8032,7 +8032,7 @@ Video Disk Recorder Revision History
the last replayed recording (if any) by pressing Ok repeatedly in the Recordings the last replayed recording (if any) by pressing Ok repeatedly in the Recordings
menu. menu.
2013-12-24: Version 2.1.3 2013-12-25: Version 2.1.3
- Changed the return value of cPositioner::HorizonLongitude() to 0 in case the - Changed the return value of cPositioner::HorizonLongitude() to 0 in case the
latitude of the antenna location is beyond +/-81 degrees. latitude of the antenna location is beyond +/-81 degrees.
@ -8069,3 +8069,6 @@ Video Disk Recorder Revision History
Recordings menu is open (reported by Lars Hanisch). Recordings menu is open (reported by Lars Hanisch).
- Added a missing closing ')' in the help and man page entry of the --vfat option - Added a missing closing ')' in the help and man page entry of the --vfat option
(reported by Lars Hanisch). (reported by Lars Hanisch).
- Fixed setting the name of the video directory to avoid a crash when using --genindex,
and also to use the correct directory with --edit (the latter reported by Marko
Mäkelä).

5
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.tvdr.de * The project's page is at http://www.tvdr.de
* *
* $Id: vdr.c 3.6 2013/12/25 11:01:28 kls Exp $ * $Id: vdr.c 3.7 2013/12/25 11:24:26 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -223,6 +223,7 @@ int main(int argc, char *argv[])
VdrUser = VDR_USER; VdrUser = VDR_USER;
#endif #endif
cVideoDirectory::SetName(VideoDirectory);
cPluginManager PluginManager(DEFAULTPLUGINDIR); cPluginManager PluginManager(DEFAULTPLUGINDIR);
static struct option long_options[] = { static struct option long_options[] = {
@ -443,6 +444,7 @@ int main(int argc, char *argv[])
case 'v': VideoDirectory = optarg; case 'v': VideoDirectory = optarg;
while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/') while (optarg && *optarg && optarg[strlen(optarg) - 1] == '/')
optarg[strlen(optarg) - 1] = 0; optarg[strlen(optarg) - 1] = 0;
cVideoDirectory::SetName(VideoDirectory);
break; break;
case 'w': if (isnumber(optarg)) { case 'w': if (isnumber(optarg)) {
int t = atoi(optarg); int t = atoi(optarg);
@ -663,7 +665,6 @@ int main(int argc, char *argv[])
// Directories: // Directories:
cVideoDirectory::SetName(VideoDirectory);
if (!ConfigDirectory) if (!ConfigDirectory)
ConfigDirectory = DEFAULTCONFDIR; ConfigDirectory = DEFAULTCONFDIR;
cPlugin::SetConfigDirectory(ConfigDirectory); cPlugin::SetConfigDirectory(ConfigDirectory);