mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
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:
parent
6a4004a8a2
commit
4e7ef3214f
@ -2138,6 +2138,7 @@ Marko M
|
|||||||
for pointing out that "Menu button closes" should actually be "Menu key closes"
|
for pointing out that "Menu button closes" should actually be "Menu key closes"
|
||||||
for fixing a missing initialization in the c'tor of cSkinLCARSDisplayChannel
|
for fixing a missing initialization in the c'tor of cSkinLCARSDisplayChannel
|
||||||
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
|
||||||
|
3
HISTORY
3
HISTORY
@ -7866,3 +7866,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
5
vdr.c
@ -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 2.57.1.3 2013/12/25 11:05:21 kls Exp $
|
* $Id: vdr.c 2.57.1.4 2013/12/25 11:40:37 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
|
||||||
|
|
||||||
|
SetVideoDirectory(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;
|
||||||
|
SetVideoDirectory(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:
|
||||||
|
|
||||||
SetVideoDirectory(VideoDirectory);
|
|
||||||
if (!ConfigDirectory)
|
if (!ConfigDirectory)
|
||||||
ConfigDirectory = DEFAULTCONFDIR;
|
ConfigDirectory = DEFAULTCONFDIR;
|
||||||
cPlugin::SetConfigDirectory(ConfigDirectory);
|
cPlugin::SetConfigDirectory(ConfigDirectory);
|
||||||
|
Loading…
Reference in New Issue
Block a user