aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTorbjörn Andersson2006-03-05 13:57:05 +0000
committerTorbjörn Andersson2006-03-05 13:57:05 +0000
commit06512360666d0bbfe8e8cf370d60c1ea0584e44b (patch)
tree9ca6b22dfa743d09271300b8752a3f8844c36355 /engines
parent7a6ff46b38ae276c8052bd0ed716c6fd38e4b335 (diff)
downloadscummvm-rg350-06512360666d0bbfe8e8cf370d60c1ea0584e44b.tar.gz
scummvm-rg350-06512360666d0bbfe8e8cf370d60c1ea0584e44b.tar.bz2
scummvm-rg350-06512360666d0bbfe8e8cf370d60c1ea0584e44b.zip
Make sure there actually is a SMUSH mixer before stopping and deleting it.
svn-id: r21099
Diffstat (limited to 'engines')
-rw-r--r--engines/scumm/scumm.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 4e86da1e73..e6ef88548a 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -935,8 +935,10 @@ ScummEngine::~ScummEngine() {
}
#ifndef DISABLE_SCUMM_7_8
- _smixer->stop();
- delete _smixer;
+ if (_smixer) {
+ _smixer->stop();
+ delete _smixer;
+ }
#endif
_mixer->stopAll();