No longer calling cPlugin::ProcessArgs() if VDR is run with the --help or --version option

This commit is contained in:
Klaus Schmidinger 2006-04-09 14:21:30 +02:00
parent a452010760
commit ceafe62671
3 changed files with 6 additions and 2 deletions

View File

@ -1400,6 +1400,8 @@ Udo Richter <udo_richter@gmx.de>
Up/Down in insert mode Up/Down in insert mode
for fixing handling the "Setup/OSD/Menu button closes" option when set to 'yes' in for fixing handling the "Setup/OSD/Menu button closes" option when set to 'yes' in
case a replay is active case a replay is active
for reporting a problem with plugins that report errors when VDR is run with the
--help or --version option
Sven Kreiensen <svenk@kammer.uni-hannover.de> Sven Kreiensen <svenk@kammer.uni-hannover.de>
for his help in keeping 'channels.conf.terr' up to date for his help in keeping 'channels.conf.terr' up to date

View File

@ -4495,3 +4495,5 @@ Video Disk Recorder Revision History
- When hitting the end of a recording in fast forward mode, VDR no longer switches - When hitting the end of a recording in fast forward mode, VDR no longer switches
back to normal speed if the recording is already finished (thanks to Reinhard back to normal speed if the recording is already finished (thanks to Reinhard
Nissl). Nissl).
- No longer calling cPlugin::ProcessArgs() if VDR is run with the --help or
--version option, to avoid error messages from plugins (reported by Udo Richter).

View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: plugin.c 1.17 2006/02/28 14:16:54 kls Exp $ * $Id: plugin.c 1.18 2006/04/09 14:16:17 kls Exp $
*/ */
#include "plugin.h" #include "plugin.h"
@ -232,7 +232,7 @@ bool cDll::Load(bool Log)
if (argc) if (argc)
plugin->SetName(argv[0]); plugin->SetName(argv[0]);
optind = 0; // to reset the getopt() data optind = 0; // to reset the getopt() data
return !argc || plugin->ProcessArgs(argc, argv); return !Log || !argc || plugin->ProcessArgs(argc, argv);
} }
} }
else { else {