More merge fun.

2011-02-13 13:50:15 -05:00
parent ade969f20c 0fbcb3d43f
commit 2bb6240e84
1 changed files with 1 additions and 1 deletions
@@ -529,7 +529,7 @@ public:
 	 * @param fBeat the beat that has a BPMSegment.
 	 * @return the BPMSegment in question.
 	 */
-	BPMSegment& GetBPMSegmentAtBeat( float fBeat ) { return GetBPMSegmentAtRow( BeatToNoteRow(fBeat)); }
+	BPMSegment& GetBPMSegmentAtBeat( float fBeat ) { return GetBPMSegmentAtRow( (int)BeatToNoteRow(fBeat)); }
 	/**
 	 * @brief Retrieve the index of the BPMSegments at the specified row.
 	 * @param iNoteRow the row that has a BPMSegment.