From fe1bfbdde2712c7e3700e0f261484d133f3828b6 Mon Sep 17 00:00:00 2001 From: Crash Cringle <30600688+CrashCringle12@users.noreply.github.com> Date: Mon, 18 Nov 2024 15:49:22 -0500 Subject: [PATCH] Fix the AutoSync Relay showing Global Offset instead of the song Offset when Auto Syncing - Unrelated to group.ini --- src/ScreenSyncOverlay.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/ScreenSyncOverlay.cpp b/src/ScreenSyncOverlay.cpp index d50c3077ae..5eb9a11e46 100644 --- a/src/ScreenSyncOverlay.cpp +++ b/src/ScreenSyncOverlay.cpp @@ -97,8 +97,15 @@ void ScreenSyncOverlay::UpdateText() set_adjustments.SetParam("visible", visible); if(visible) { - float fNew = PREFSMAN->m_fGlobalOffsetSeconds; - float fOld = AdjustSync::s_fGlobalOffsetSecondsOriginal; + float fNew; + float fOld; + if (GAMESTATE->m_SongOptions.GetCurrent().m_AutosyncType == AutosyncType_Machine) { + fNew = PREFSMAN->m_fGlobalOffsetSeconds; + fOld = AdjustSync::s_fGlobalOffsetSecondsOriginal; + } else { + fNew = GAMESTATE->m_pCurSong->m_SongTiming.m_fBeat0OffsetInSeconds; + fOld = AdjustSync::s_vpTimingDataOriginal[0].m_fBeat0OffsetInSeconds; + } float fStdDev = AdjustSync::s_fStandardDeviation; RString s; s += OLD_OFFSET.GetValue() + ssprintf( ": %0.3f\n", fOld );