From 6e8137500d0640134f3b929ff1b5f9ad38309459 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Mon, 15 Aug 2011 17:54:06 -0400
Subject: [PATCH] Partial revert. Restore most delays/stops.

The only thing to fix properly
is when stops and delays share the same row.
---
 src/TimingData.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/TimingData.cpp b/src/TimingData.cpp
index ab2907b316..36ec6004da 100644
--- a/src/TimingData.cpp
+++ b/src/TimingData.cpp
@@ -938,8 +938,7 @@ void TimingData::GetBeatAndBPSFromElapsedTimeNoOffset( float fElapsedTime, float
 			iEventType = FOUND_DELAY;
 		}
 		if (itSS != segs[SEGMENT_STOP].end() &&
-			(*itSS)->GetRow() < iEventRow &&
-			iEventType != FOUND_DELAY )
+			(*itSS)->GetRow() < iEventRow ) // && iEventType != FOUND_DELAY )
 		{
 			iEventRow = (*itSS)->GetRow();
 			iEventType = FOUND_STOP;