From 8b4d758e4cba1d06aa16efbb789aab8239039c15 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Mon, 10 Jan 2011 22:45:48 -0500
Subject: [PATCH 1/2] Make sure DELAYS come before STOPS.

---
 src/TimingData.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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

From f631becd70711f3f6df3b623058144cd2aee2aef Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Mon, 10 Jan 2011 22:46:38 -0500
Subject: [PATCH 2/2] See previous commit.

---
 Docs/Changelog_sm-ssc.txt | 1 +
 1 file changed, 1 insertion(+)

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
 --------