aboutsummaryrefslogtreecommitdiff
path: root/sound/mixer.cpp
diff options
context:
space:
mode:
authorChris Apers2003-09-01 10:12:28 +0000
committerChris Apers2003-09-01 10:12:28 +0000
commite6a0261c7e599abbe95ffef44bcebc3b38e2cb73 (patch)
tree09959dc68966a94bb21cfc711fe5c714f1127eaa /sound/mixer.cpp
parentebf9114f68eaf9c6111cfb81ea311f120f763f09 (diff)
downloadscummvm-rg350-e6a0261c7e599abbe95ffef44bcebc3b38e2cb73.tar.gz
scummvm-rg350-e6a0261c7e599abbe95ffef44bcebc3b38e2cb73.tar.bz2
scummvm-rg350-e6a0261c7e599abbe95ffef44bcebc3b38e2cb73.zip
The channel could be destroyed so changeVolumeAndPan can't access it in that case
svn-id: r9955
Diffstat (limited to 'sound/mixer.cpp')
-rw-r--r--sound/mixer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp
index 4e31ac7f0d..f7db01cb02 100644
--- a/sound/mixer.cpp
+++ b/sound/mixer.cpp
@@ -464,8 +464,8 @@ void Channel::mix(int16 *data, uint len) {
} else {
assert(_converter);
_converter->flow(*_input, data, len, getVolume());
+ changeVolumeAndPan(data, len, _volume, _pan);
}
- changeVolumeAndPan(data, len, _volume, _pan);
}
/* RAW mixer */