Merge branch 'seq' into test_edit

ggarra13 · Sep 27, 2023 · 6aa27b9 · 6aa27b9
2 parents 5cf8e8d + c6120c5
commit 6aa27b9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/tlCore/FileInfo.cpp b/lib/tlCore/FileInfo.cpp
@@ -33,11 +33,13 @@ namespace tl
 
         void FileInfo::sequence(const FileInfo& value)
         {
+            const bool hasNumber = !_path.getNumber().empty();
             math::IntRange sequence = _path.getSequence();
             const math::IntRange& otherSequence = value.getPath().getSequence();
             sequence.expand(otherSequence.getMin());
             sequence.expand(otherSequence.getMax());
-            _path.setSequence(sequence);
+            if (hasNumber)
+                _path.setSequence(sequence);
             _size += value._size;
             _permissions = std::min(_permissions, value._permissions);
             _time = std::max(_time, value._time);

diff --git a/lib/tlTimeline/TimelineCreate.cpp b/lib/tlTimeline/TimelineCreate.cpp
@@ -390,7 +390,9 @@ namespace tl
                             list.end(),
                             [path](const file::FileInfo& value)
                             {
-                                return value.getPath().sequence(path);
+                                const auto& vpath = value.getPath();
+                                return vpath.sequence(path) &&
+                                    vpath.isSequence();
                             });
                         if (i != list.end())
                         {