fix songs with stops and manually set BPM not disqualifying with C*

2005-06-10 20:29:42 +00:00
parent 11b47255ee
commit d1fdc21864
4 changed files with 27 additions and 11 deletions
@@ -1444,12 +1444,22 @@ bool Song::IsEditAlreadyLoaded( Steps* pSteps ) const

 bool Song::HasSignificantBpmChangesOrStops() const
 {
+	if( m_Timing.HasStops() )
+		return true;
+
 	// Don't consider BPM changes that only are only for maintaining sync as 
 	// a real BpmChange.
 	if( m_DisplayBPMType == DISPLAY_SPECIFIED )
-		return false;
+	{
+		if( m_fSpecifiedBPMMin != m_fSpecifiedBPMMax )
+			return true;
+	}
+	else if( m_Timing.HasBpmChanges() )
+	{
+		return true;
+	}

-	return m_Timing.HasBpmChangesOrStops();
+	return false;
 }

 float Song::GetStepsSeconds() const