From ceafe626717fabaa8463586bf17458054a4be41d Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 9 Apr 2006 14:21:30 +0200 Subject: No longer calling cPlugin::ProcessArgs() if VDR is run with the --help or --version option --- CONTRIBUTORS | 2 ++ HISTORY | 2 ++ plugin.c | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index c6085514..d70f4aff 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1400,6 +1400,8 @@ Udo Richter Up/Down in insert mode for fixing handling the "Setup/OSD/Menu button closes" option when set to 'yes' in 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 for his help in keeping 'channels.conf.terr' up to date diff --git a/HISTORY b/HISTORY index 01ef15e3..bf0b1d66 100644 --- a/HISTORY +++ b/HISTORY @@ -4495,3 +4495,5 @@ Video Disk Recorder Revision History - 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 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). diff --git a/plugin.c b/plugin.c index 6ceb561b..69d558cf 100644 --- a/plugin.c +++ b/plugin.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * 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" @@ -232,7 +232,7 @@ bool cDll::Load(bool Log) if (argc) plugin->SetName(argv[0]); optind = 0; // to reset the getopt() data - return !argc || plugin->ProcessArgs(argc, argv); + return !Log || !argc || plugin->ProcessArgs(argc, argv); } } else { -- cgit v1.2.3