Added a getArgumentAfterOption due to removed behaviour in juce::Argu…

…mentList to fix some tests
Tracktion · Mar 20, 2019 · b488fbb · b488fbb
1 parent 716e4de
commit b488fbb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/CHANGELIST.md b/CHANGELIST.md
@@ -1,5 +1,8 @@
 # pluginval Change List
 
+### 0.2.3
+ - Fixed some failing tests on startup
+
 ### 0.2.2
  - Added a test for disabled HiDPI awareness on Windows
  - Updated JUCE to v5.4.3

diff --git a/Source/CommandLine.cpp b/Source/CommandLine.cpp
@@ -111,16 +111,25 @@ void CommandLineValidator::connectionLost()
 
 
 //==============================================================================
+static inline ArgumentList::Argument getArgumentAfterOption (const ArgumentList& args, StringRef option)
+{
+    for (int i = 0; i < args.size() - 1; ++i)
+        if (args[i] == option)
+            return args[i + 1];
+
+    return {};
+}
+
 static var getOptionValue (const ArgumentList& args, StringRef option, var defaultValue, StringRef errorMessage)
 {
     if (args.containsOption (option))
     {
-        const auto nextArg = args.getValueForOption (option);
+        const auto nextArg = getArgumentAfterOption (args, option);
 
-        if (nextArg.isEmpty())
+        if (nextArg.isShortOption() || nextArg.isLongOption())
             ConsoleApplication::fail (errorMessage, -1);
 
-        return nextArg;
+        return nextArg.text;
     }
 
     return defaultValue;