Fix logic for error output.

PDAL · Jun 18, 2020 · 5164429 · 5164429
1 parent f26f007
commit 5164429
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/pdal/util/ProgramArgs.hpp b/pdal/util/ProgramArgs.hpp
@@ -413,11 +413,14 @@ class TArg : public Arg
             std::string error(m_error);
 
             if (error.empty())
-                error = "Invalid value for argument '" + m_longname + "': " +
-                    status.what();
-            if (error.empty())
-                error = "Invalid value '" + s + "' for argument '" +
-                    m_longname + "'.";
+            {
+                if (status.what().size())
+                    error = "Invalid value for argument '" + m_longname +
+                        "': " + status.what();
+                else
+                    error = "Invalid value '" + s + "' for argument '" +
+                        m_longname + "'.";
+            }
             throw arg_val_error(error);
         }
         m_set = true;
@@ -765,11 +768,14 @@ class VArg : public BaseVArg
             std::string error(m_error);
 
             if (error.empty())
-                error = "Invalid value for argument '" + m_longname + "': " +
-                    status.what();
-            if (error.empty())
-                error = "Invalid value '" + s + "' for argument '" +
-                    m_longname + "'.";
+            {
+                if (status.what().size())
+                    error = "Invalid value for argument '" + m_longname +
+                        "': " + status.what();
+                else
+                    error = "Invalid value '" + s + "' for argument '" +
+                        m_longname + "'.";
+            }
             throw arg_val_error(error);
         }
         if (!m_set)