CLArgs: avoid mistaking an argument for a list of frame ranges when p…

…art of it may look like a frame range see #644 (partially fixes it)
NatronGitHub · Jul 5, 2021 · 9d1b500 · 9d1b500
1 parent 2e71f8f
commit 9d1b500
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/Engine/CLArgs.cpp b/Engine/CLArgs.cpp
@@ -715,19 +715,23 @@ tryParseMultipleFrameRanges(const QString& args,
                             std::list<std::pair<int, std::pair<int, int> > >& frameRanges)
 {
     QStringList splits = args.split( QChar::fromLatin1(',') );
-    bool added = false;
+    std::list<std::pair<int, std::pair<int, int> > > newFrameRanges;
 
     Q_FOREACH(const QString &split, splits) {
         std::pair<int, int> frameRange;
         int frameStep = 0;
 
-        if ( tryParseFrameRange(split, frameRange, frameStep) ) {
-            added = true;
-            frameRanges.push_back( std::make_pair(frameStep, frameRange) );
+        if ( !tryParseFrameRange(split, frameRange, frameStep) ) {
+            // not a frame range.
+            return false;
+        } else {
+            newFrameRanges.push_back( std::make_pair(frameStep, frameRange) );
         }
     }
 
-    return added;
+    frameRanges.merge(newFrameRanges);
+
+    return !newFrameRanges.empty();
 }
 
 void