aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-07-02 00:46:24 +0000
committerMax Horn2003-07-02 00:46:24 +0000
commit2cb05bedb970d6c4fcda91f52a3c5beb722d7ada (patch)
tree35f84ed6723fa95189ff5e03f771bf59ef14b71c
parent33c5c72e4c1752521f2a2df0e0ffcd45ffb5264b (diff)
downloadscummvm-rg350-2cb05bedb970d6c4fcda91f52a3c5beb722d7ada.tar.gz
scummvm-rg350-2cb05bedb970d6c4fcda91f52a3c5beb722d7ada.tar.bz2
scummvm-rg350-2cb05bedb970d6c4fcda91f52a3c5beb722d7ada.zip
possible fix for bug #763714: DIG: 'Trying to append to a nonexistant stream 0'
svn-id: r8697
-rw-r--r--scumm/sound.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 28b95c776f..7f424c7875 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -574,8 +574,10 @@ int Sound::startTalkSound(uint32 offset, uint32 b, int mode) {
void Sound::stopTalkSound() {
if (_sfxMode & 2) {
- if (_talkChannel != -1)
+ if (_talkChannel != -1) {
_scumm->_mixer->stop(_talkChannel);
+ _talkChannel = -1;
+ }
_sfxMode &= ~2;
}
}
@@ -1078,8 +1080,8 @@ void Sound::bundleMusicHandler(Scumm *scumm) {
_nameBundleMusic = "";
if (_bundleMusicTrack != -1) {
_scumm->_mixer->stop(_bundleMusicTrack);
+ _bundleMusicTrack = -1;
}
- _bundleMusicTrack = -1;
if (_musicBundleBufFinal) {
free(_musicBundleBufFinal);
_musicBundleBufFinal = NULL;