From: Christophe Massiot <massiot@videolan.org>
Date: Sat, 18 May 2002 17:53:11 +0000 (+0000)
Subject: * Warning levels are no longer additive, patch courtesy of Arnaud de
X-Git-Tag: 0.4.0~70
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=bdb827829944ca0cebaae9bdd5864a0bf54d1fca;p=vlc

* Warning levels are no longer additive, patch courtesy of Arnaud de
  Bossoreille de Ribou <bozo@via.ecp.fr>
---

diff --git a/src/misc/configuration.c b/src/misc/configuration.c
index f2e95248d9..a01bfa25fd 100644
--- a/src/misc/configuration.c
+++ b/src/misc/configuration.c
@@ -2,7 +2,7 @@
  * configuration.c management of the modules configuration
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: configuration.c,v 1.24 2002/05/18 13:30:28 gbazin Exp $
+ * $Id: configuration.c,v 1.25 2002/05/18 17:53:11 massiot Exp $
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
  *
@@ -994,7 +994,10 @@ int config_LoadCmdLine( int *pi_argc, char *ppsz_argv[],
     if( b_ignore_errors ) free( ppsz_argv );
 
     /* Update the warning level */
-    p_main->i_warning_level += config_GetIntVariable( "warning" );
+    if( !p_main->i_warning_level )
+    {
+        p_main->i_warning_level += config_GetIntVariable( "warning" );
+    }
     p_main->i_warning_level = ( p_main->i_warning_level < 0 ) ? 0 :
         p_main->i_warning_level;
     config_PutIntVariable( "warning", p_main->i_warning_level );