aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Göffringmann2004-12-09 16:33:54 +0000
committerRobert Göffringmann2004-12-09 16:33:54 +0000
commit846f520ed69281dc113cfb71b5e7fa76da88cc51 (patch)
tree42e7e066ee4006643151334b4807b2f204960052
parent0d7ab01640a2209167272936c624c32142131993 (diff)
downloadscummvm-rg350-846f520ed69281dc113cfb71b5e7fa76da88cc51.tar.gz
scummvm-rg350-846f520ed69281dc113cfb71b5e7fa76da88cc51.tar.bz2
scummvm-rg350-846f520ed69281dc113cfb71b5e7fa76da88cc51.zip
fix potential race condition
svn-id: r16003
-rw-r--r--sword1/music.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/sword1/music.cpp b/sword1/music.cpp
index cf01b50b5a..d24203bc2f 100644
--- a/sword1/music.cpp
+++ b/sword1/music.cpp
@@ -234,11 +234,11 @@ Music::Music(OSystem *system, SoundMixer *pMixer) {
_system = system;
_mixer = pMixer;
_sampleRate = pMixer->getOutputRate();
- _mixer->setupPremix(this);
_mutex = _system->createMutex();
_converter[0] = NULL;
_converter[1] = NULL;
_volumeL = _volumeR = 192;
+ _mixer->setupPremix(this);
}
Music::~Music() {