[Scummvm-cvs-logs] CVS: scummvm/sword2/driver animation.cpp,1.21.2.1,1.21.2.2

[Nicolas Bacca]

Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19746/sword2/driver

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

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.cpp,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -d -r1.21.2.1 -r1.21.2.2
--- animation.cpp	15 Feb 2004 14:16:33 -0000	1.21.2.1
+++ animation.cpp	22 Feb 2004 18:04:26 -0000	1.21.2.2
@@ -361,6 +361,11 @@
 				 * 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) ||
 					((_vm->_mixer->getChannelElapsedTime(bgSound) * 12) / 1000 < framenum + 1)) {