BpmControl: Add check to verify that loop positions are valid

As suggested here: mixxxdj#4191 (comment)
ronso0 · Sep 24, 2021 · 515eb54 · 515eb54
1 parent 8810241
commit 515eb54
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/engine/controls/bpmcontrol.cpp b/src/engine/controls/bpmcontrol.cpp
@@ -451,10 +451,14 @@ double BpmControl::calcSyncedRate(double userTweak) {
         const auto loopEndPosition =
                 mixxx::audio::FramePos::fromEngineSamplePosMaybeInvalid(
                         m_pLoopEndPosition->get());
-        const auto loopSize = (loopEndPosition - loopStartPosition) / beatLengthFrames;
-        if (loopSize < 1.0 && loopSize > 0) {
-            m_resetSyncAdjustment = true;
-            return rate + userTweak;
+        // This should always be true when a loop is enabled, but we check it
+        // anyway to prevent race conditions.
+        if (loopStartPosition.isValid() && loopEndPosition.isValid()) {
+            const auto loopSize = (loopEndPosition - loopStartPosition) / beatLengthFrames;
+            if (loopSize < 1.0 && loopSize > 0) {
+                m_resetSyncAdjustment = true;
+                return rate + userTweak;
+            }
         }
     }