[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.112,1.113

Chris Apers chrilith at users.sourceforge.net
Mon Sep 1 03:13:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv14769/sound

Modified Files:
	mixer.cpp 
Log Message:
The channel could be destroyed so changeVolumeAndPan can't access it in that case

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- mixer.cpp	31 Aug 2003 20:26:21 -0000	1.112
+++ mixer.cpp	1 Sep 2003 10:12:28 -0000	1.113
@@ -464,8 +464,8 @@
 	} else {
 		assert(_converter);
 		_converter->flow(*_input, data, len, getVolume());
+		changeVolumeAndPan(data, len, _volume, _pan);
 	}
-	changeVolumeAndPan(data, len, _volume, _pan);
 }
 
 /* RAW mixer */





More information about the Scummvm-git-logs mailing list