aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorPaweł Kołodziejski2004-01-18 09:35:05 +0000
committerPaweł Kołodziejski2004-01-18 09:35:05 +0000
commitf27e6a27d6a234dfdb1482566369d12b3d62db91 (patch)
treed3aa9536fa389652d682d038d81f27b152de6f80 /scumm
parent06de6f1dfb7e6baba27e321735b89e9bf95e2876 (diff)
downloadscummvm-rg350-f27e6a27d6a234dfdb1482566369d12b3d62db91.tar.gz
scummvm-rg350-f27e6a27d6a234dfdb1482566369d12b3d62db91.tar.bz2
scummvm-rg350-f27e6a27d6a234dfdb1482566369d12b3d62db91.zip
cleanup
svn-id: r12470
Diffstat (limited to 'scumm')
-rw-r--r--scumm/imuse_digi/dimuse_sndmgr.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/scumm/imuse_digi/dimuse_sndmgr.cpp b/scumm/imuse_digi/dimuse_sndmgr.cpp
index e615278401..02417db551 100644
--- a/scumm/imuse_digi/dimuse_sndmgr.cpp
+++ b/scumm/imuse_digi/dimuse_sndmgr.cpp
@@ -38,8 +38,7 @@ ImuseDigiSndMgr::ImuseDigiSndMgr(ScummEngine *scumm) {
ImuseDigiSndMgr::~ImuseDigiSndMgr() {
for (int l = 0; l < MAX_IMUSE_SOUNDS; l++) {
- if (&_sounds[l])
- closeSound(&_sounds[l]);
+ closeSound(&_sounds[l]);
}
#ifdef __PALM_OS__
BundleCodecs::releaseImcTables();
@@ -281,7 +280,8 @@ void ImuseDigiSndMgr::closeSound(soundStruct *soundHandle) {
if (_sounds[l]._bundle)
delete _sounds[l]._bundle;
for (int r = 0; r < _sounds[l].numSyncs; r++)
- free(_sounds[l].sync[r].ptr);
+ if (_sounds[l].sync[r].ptr)
+ free(_sounds[l].sync[r].ptr);
memset(&_sounds[l], 0, sizeof(soundStruct));
}
}