From 707ed2b4f7830e652244422ac700a210fa80dbe5 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sun, 4 Apr 2004 23:16:17 +0000 Subject: [PATCH] fix assert --- stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp index c8a2d45925..b6bb1b1c37 100644 --- a/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp +++ b/stepmania/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp @@ -885,8 +885,10 @@ void MovieTexture_FFMpeg::DecoderThread() SDL_Delay( int(1000*fTime) ); { + /* The only reason m_BufferFinished might be non-zero right now (before + * ConvertFrame()) is if we're quitting. */ int n = SDL_SemValue( m_BufferFinished ); - ASSERT_M( n == 0, ssprintf("%i", n) ); + ASSERT_M( n == 0 || m_State == DECODER_QUIT, ssprintf("%i, %i", n, m_State) ); } ConvertFrame();