aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTravis Howell2003-07-06 06:36:26 +0000
committerTravis Howell2003-07-06 06:36:26 +0000
commit817d600d8ef191e9bd8745f4eff23998b72f313d (patch)
tree436fa448689ae9f1e633a92609dd4111e3c6c610 /sound
parent5f3d4c34356fc394624532e09e2f259631274c8e (diff)
downloadscummvm-rg350-817d600d8ef191e9bd8745f4eff23998b72f313d.tar.gz
scummvm-rg350-817d600d8ef191e9bd8745f4eff23998b72f313d.tar.bz2
scummvm-rg350-817d600d8ef191e9bd8745f4eff23998b72f313d.zip
More fixes from Hibernatus
svn-id: r8792
Diffstat (limited to 'sound')
-rw-r--r--sound/mixer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp
index 0209851973..0a51d6dad2 100644
--- a/sound/mixer.cpp
+++ b/sound/mixer.cpp
@@ -231,7 +231,7 @@ int SoundMixer::playRaw(PlayingSoundHandle *handle, void *sound, uint32 size, ui
// Prevent duplicate sounds
if (id != -1) {
for (int i = 0; i != NUM_CHANNELS; i++)
- if (_channels[i]->_id == id && _channels[i] != NULL)
+ if (_channels[i] != NULL && _channels[i]->_id == id)
return -1;
}