aboutsummaryrefslogtreecommitdiff
path: root/scumm/saveload.cpp
diff options
context:
space:
mode:
authorJamieson Christian2002-12-07 18:03:10 +0000
committerJamieson Christian2002-12-07 18:03:10 +0000
commitb382c79a4141c3dacc72978e581b2a483fbc10b9 (patch)
treead68fab8922e76d44cca80956b6a441630966ffd /scumm/saveload.cpp
parent6049cc9035aae9789565d98532041e1bfbff6df2 (diff)
downloadscummvm-rg350-b382c79a4141c3dacc72978e581b2a483fbc10b9.tar.gz
scummvm-rg350-b382c79a4141c3dacc72978e581b2a483fbc10b9.tar.bz2
scummvm-rg350-b382c79a4141c3dacc72978e581b2a483fbc10b9.zip
Fixed music overlaps when running ScummVM with the -x option
svn-id: r5872
Diffstat (limited to 'scumm/saveload.cpp')
-rw-r--r--scumm/saveload.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/scumm/saveload.cpp b/scumm/saveload.cpp
index 5c227d8e33..434efb06e2 100644
--- a/scumm/saveload.cpp
+++ b/scumm/saveload.cpp
@@ -631,11 +631,14 @@ void Scumm::saveOrLoad(Serializer *s)
int var120Backup;
int var98Backup;
- if (_mixer && !s->isSaving()) {
- if (_imuseDigital) {
- _imuseDigital->stopAll();
- } else {
- _mixer->stopAll();
+ if (!s->isSaving()) {
+ _sound->stopAllSounds();
+ if (_mixer) {
+ if (_imuseDigital) {
+ _imuseDigital->stopAll();
+ } else {
+ _mixer->stopAll();
+ }
}
}