summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-03-12 09:40:29 +0000
committertron <tron@openttd.org>2005-03-12 09:40:29 +0000
commit39305c1a7c88d219ba3943aad59ae8856731ad52 (patch)
tree59e92ffa7a1819727129646d328aaf1af568a3b1
parentf04780e66d038b0fc9f376dcec1e77d2d94ae29b (diff)
downloadopenttd-39305c1a7c88d219ba3943aad59ae8856731ad52.tar.xz
(svn r2001) Resolve a race condition which could lead to dropped a sound and a memory leak
-rw-r--r--mixer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mixer.c b/mixer.c
index 1a113dbed..e88b9533b 100644
--- a/mixer.c
+++ b/mixer.c
@@ -73,8 +73,8 @@ static void mix_int8_to_int16(MixerChannel *sc, int16 *buffer, uint samples)
static void MxCloseChannel(MixerChannel *mc)
{
if (mc->flags & MX_AUTOFREE) free(mc->memory);
- mc->memory = NULL;
mc->active = false;
+ mc->memory = NULL;
}
void MxMixSamples(Mixer *mx, void *buffer, uint samples)