From 5bcccc78b0c0a72719fecf7d0216a76dd5fedae2 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 28 Mar 2006 07:26:37 +0000 Subject: [PATCH] Sometimes, the sync changes negligibly due to rounding error when the user puts it back where it was. Use the same logic as GetSyncChangeTextGlobal and GetSyncChangeTextSong; if the changes are so small that we wouldn't even display them, don't count them as changed. (fixes ScreenSaveSync coming up with an empty list) --- stepmania/src/AdjustSync.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/stepmania/src/AdjustSync.cpp b/stepmania/src/AdjustSync.cpp index 3949108154..8b6fe6269c 100644 --- a/stepmania/src/AdjustSync.cpp +++ b/stepmania/src/AdjustSync.cpp @@ -30,13 +30,10 @@ bool AdjustSync::IsSyncDataChanged() // Can't sync in course modes if( GAMESTATE->IsCourseMode() ) return false; - - if( GAMESTATE->m_pCurSong && *s_pTimingDataOriginal != GAMESTATE->m_pCurSong->m_Timing ) - return true; - if( s_fGlobalOffsetSecondsOriginal != PREFSMAN->m_fGlobalOffsetSeconds ) - return true; - - return false; + vector vs; + AdjustSync::GetSyncChangeTextGlobal( vs ); + AdjustSync::GetSyncChangeTextSong( vs ); + return !vs.empty(); } void AdjustSync::SaveSyncChanges()