From bd639a754777b87d855c5d8a4b46f1e5e607098a Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 30 Nov 2006 07:26:34 +0000 Subject: [PATCH] fix bounds assert --- stepmania/src/RageSoundReader_SpeedChange.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/stepmania/src/RageSoundReader_SpeedChange.cpp b/stepmania/src/RageSoundReader_SpeedChange.cpp index 44e8924cca..eac6af2a72 100644 --- a/stepmania/src/RageSoundReader_SpeedChange.cpp +++ b/stepmania/src/RageSoundReader_SpeedChange.cpp @@ -219,7 +219,13 @@ bool RageSoundReader_SpeedChange::Step() int RageSoundReader_SpeedChange::GetCursorAvail() const { - int iCursorAvail = min( GetWindowSizeFrames(), m_iDataBufferAvailFrames-m_Channels[0].m_iCorrelatedPos ) - m_iPos; + int iCursorAvail = GetWindowSizeFrames() - m_iPos; + for( size_t i = 0; i < m_Channels.size(); ++i ) + { + int iCursorAvailForChannel = (m_iDataBufferAvailFrames-m_Channels[i].m_iCorrelatedPos) - m_iPos; + iCursorAvail = min( iCursorAvail, iCursorAvailForChannel ); + } + return iCursorAvail; }