From f01e37854ae923299f9040b8fdee666623ac1016 Mon Sep 17 00:00:00 2001
From: Jason Felds <jafelds@gmail.com>
Date: Tue, 5 Apr 2011 01:28:06 -0400
Subject: [PATCH] [sm130labels] Fix keyboard function.

---
 src/TimingData.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/TimingData.cpp b/src/TimingData.cpp
index 68f0a81431..2f808b503c 100644
--- a/src/TimingData.cpp
+++ b/src/TimingData.cpp
@@ -523,17 +523,13 @@ float TimingData::GetPreviousLabelSegmentBeatAtRow( int iRow ) const
 	float backup = -1;
 	for (unsigned i = 0; i < m_LabelSegments.size(); i++ )
 	{
-		if( m_LabelSegments[i].m_iStartRow > iRow )
+		if( m_LabelSegments[i].m_iStartRow >= iRow )
 		{
-			if( backup > -1 )
-			{
-				return backup;
-			}
 			break;
 		}
 		backup = NoteRowToBeat(m_LabelSegments[i].m_iStartRow);
 	}
-	return NoteRowToBeat(iRow);
+	return (backup > -1) ? backup : NoteRowToBeat(iRow);
 }
 
 float TimingData::GetNextLabelSegmentBeatAtRow( int iRow ) const