Partial revert. Restore most delays/stops.

The only thing to fix properly is when stops and delays share the same row.
2011-08-15 17:54:06 -04:00
parent 0dc695b247
commit 6e8137500d
1 changed files with 1 additions and 2 deletions
@@ -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;