[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.150,1.151

Max Horn fingolfin at users.sourceforge.net
Tue Jul 1 17:47:08 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv30781

Modified Files:
	sound.cpp 
Log Message:
possible fix for bug #763714: DIG: 'Trying to append to a nonexistant stream 0'

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- sound.cpp	30 Jun 2003 23:18:20 -0000	1.150
+++ sound.cpp	2 Jul 2003 00:46:24 -0000	1.151
@@ -574,8 +574,10 @@
 
 void Sound::stopTalkSound() {
 	if (_sfxMode & 2) {
-		if (_talkChannel != -1)
+		if (_talkChannel != -1) {
 			_scumm->_mixer->stop(_talkChannel);
+			_talkChannel = -1;
+		}
 		_sfxMode &= ~2;
 	}
 }
@@ -1078,8 +1080,8 @@
 		_nameBundleMusic = "";
 		if (_bundleMusicTrack != -1) {
 			_scumm->_mixer->stop(_bundleMusicTrack);
+			_bundleMusicTrack = -1;
 		}
-		_bundleMusicTrack = -1;
 		if (_musicBundleBufFinal) {
 			free(_musicBundleBufFinal);
 			_musicBundleBufFinal = NULL;





More information about the Scummvm-git-logs mailing list