[Scummvm-cvs-logs] CVS: scummvm/sword1 animation.cpp,1.13,1.14

[Nicolas Bacca]

Update of /cvsroot/scummvm/scummvm/sword1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21905/sword1

Modified Files:
	animation.cpp 
Log Message:
Avoid deadlock in MPEG-2 cutscenes + slow devices

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/animation.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- animation.cpp	22 Feb 2004 14:11:12 -0000	1.13
+++ animation.cpp	22 Feb 2004 18:13:54 -0000	1.14
@@ -307,6 +307,10 @@
 				 * frames if we run behind and delaying if we are too fast
 				 */
 
+				/* Avoid deadlock is sound was too far ahead */
+				if (bgSoundStream && !bgSound.isActive())
+					return false;
+
 #ifdef BACKEND_8BIT
 				if (checkPaletteSwitch() || (bgSoundStream == NULL) ||
                                     ((_snd->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1)) {