Skip to content

Commit

Permalink
Don't allow syncing if TimingDatas don't match
Browse files Browse the repository at this point in the history
i dont know a single use case for when the 2 files dont match, so just dont allow it at all
  • Loading branch information
poco0317 committed Dec 8, 2019
1 parent 1460422 commit 8f184b9
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/Etterna/Models/Misc/AdjustSync.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,11 @@ AdjustSync::GetSyncChangeTextSong(vector<RString>& vsAddTo)
TimingData& original = s_vpTimingDataOriginal[0];
TimingData& testing = GAMESTATE->m_pCurSong->m_SongTiming;

// the files should match. typically this is the case but sometimes that
// just isnt true and we really dont want to let it happen
if (original.m_sFile != testing.m_sFile)
return;

{
float fOld = Quantize(original.m_fBeat0OffsetInSeconds, 0.001f);
float fNew = Quantize(testing.m_fBeat0OffsetInSeconds, 0.001f);
Expand Down

0 comments on commit 8f184b9

Please sign in to comment.