From: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Date: Sat, 8 Oct 2011 14:24:22 +0000 (-0300)
Subject: Fixed a bug: the command line parsing should succeed if any of generic or configurati... 
X-Git-Tag: v1.3~11^2~34^2~3
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=feb5a5d2858fd83653000a7ff56093f5434a269a;p=pingcheck

Fixed a bug: the command line parsing should succeed if any of generic or configuration parsing were successful
---

diff --git a/src/config/configurationcommandline.cpp b/src/config/configurationcommandline.cpp
index f958cd1..a6cefc0 100644
--- a/src/config/configurationcommandline.cpp
+++ b/src/config/configurationcommandline.cpp
@@ -146,14 +146,14 @@ bool ConfigurationCommandLine::parse(
 
     ConfigurationOptions options;
 
+    bool generic_parsed = options.parse_generic_options( vm, configuration );
     // Do not proceed if it is one of the halt options (i.e. --version, --help)
     bool halt = options.halt_on_generic_options( vm );
     if ( halt )
     {
         return false;
     }
-    bool generic_parsed = options.parse_generic_options( vm, configuration );
     bool configuration_parsed = options.parse_configuration_options( vm, configuration );
 
-    return ( generic_parsed && configuration_parsed );
+    return ( generic_parsed || configuration_parsed );
 }