From 3925c38316b4bb51bb77e1373fdb56ef82863794 Mon Sep 17 00:00:00 2001 From: AJ Kelly Date: Mon, 10 Jan 2011 23:58:53 -0600 Subject: [PATCH] trying to undo the death of default branch --- Docs/Changelog_sm-ssc.txt | 1 + src/TimingData.h | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt index e4ae9fb431..bbd8718e76 100644 --- a/Docs/Changelog_sm-ssc.txt +++ b/Docs/Changelog_sm-ssc.txt @@ -16,6 +16,7 @@ sm-ssc v1.2.1 | 20110??? 20110110 -------- * [Character] Added GetDisplayName Lua binding. [freem] +* Make sure that DELAYS come first if STOPS share the same beat. [Wolfman2000] 20110109 -------- diff --git a/src/TimingData.h b/src/TimingData.h index 86ac600492..942e4f821d 100644 --- a/src/TimingData.h +++ b/src/TimingData.h @@ -54,7 +54,11 @@ struct StopSegment return true; } bool operator!=( const StopSegment &other ) const { return !operator==(other); } - bool operator<( const StopSegment &other ) const { return m_iStartRow < other.m_iStartRow; } + bool operator<( const StopSegment &other ) const + { + return ( m_iStartRow < other.m_iStartRow ) || + ( m_iStartRow == other.m_iStartRow && m_bDelay ); + } }; /* This only supports simple time signatures. The upper number (called the numerator here, though this isn't