LoopingControl: Combine loop reset code paths in slotLoopStartPos()

mixxxdj · Sep 6, 2021 · d8f91a9 · d8f91a9
1 parent 6efff85
commit d8f91a9
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/src/engine/controls/loopingcontrol.cpp b/src/engine/controls/loopingcontrol.cpp
@@ -959,19 +959,17 @@ void LoopingControl::slotLoopStartPos(double positionSamples) {
     if (!position.isValid()) {
         emit loopReset();
         setLoopingEnabled(false);
+    } else if (loopInfo.endPosition.isValid() && loopInfo.endPosition <= position) {
+        emit loopReset();
+        loopInfo.endPosition = mixxx::audio::kInvalidFramePos;
+        m_pCOLoopEndPosition->set(kNoTrigger);
+        setLoopingEnabled(false);
     }
 
     loopInfo.seekMode = LoopSeekMode::MovedOut;
     loopInfo.startPosition = position;
     m_pCOLoopStartPosition->set(position.toEngineSamplePosMaybeInvalid());
 
-    if (loopInfo.startPosition.isValid() && loopInfo.endPosition.isValid() &&
-            loopInfo.endPosition <= loopInfo.startPosition) {
-        emit loopReset();
-        loopInfo.endPosition = mixxx::audio::kInvalidFramePos;
-        m_pCOLoopEndPosition->set(kNoTrigger);
-        setLoopingEnabled(false);
-    }
     m_loopInfo.setValue(loopInfo);
 }