Merge branch '2.6' into 'main'

Author: mixxxbot

src/engine/controls/bpmcontrol.cpp

@@ -601,7 +601,8 @@ double BpmControl::calcSyncAdjustment(bool userTweakingSync) {
         adjustment = 1.0;
         // When updating the user offset, make sure to remove the existing offset or else it
         // will get double-applied.
-        m_dUserOffset.setValue(error + curUserOffset);
+        double offset = std::fmod(error + curUserOffset, 1.0f);
+        m_dUserOffset.setValue(offset);
     } else {
         // Threshold above which we do sync adjustment.
         const double kErrorThreshold = 0.01;