From b58bbd719cad79445f496828f1a49465481826ee Mon Sep 17 00:00:00 2001
From: Florian Kagerer
Date: Fri, 8 Oct 2010 16:31:08 +0000
Subject: SCUMM/FM-TOWNS: fixed threading issue in sfx code

svn-id: r53074
---
 sound/softsynth/fmtowns_pc98/towns_audio.cpp        | 1 -
 sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp  | 1 -
 sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'sound/softsynth')

diff --git a/sound/softsynth/fmtowns_pc98/towns_audio.cpp b/sound/softsynth/fmtowns_pc98/towns_audio.cpp
index 58e09f291b..f9c9529214 100644
--- a/sound/softsynth/fmtowns_pc98/towns_audio.cpp
+++ b/sound/softsynth/fmtowns_pc98/towns_audio.cpp
@@ -226,7 +226,6 @@ TownsAudioInterface::TownsAudioInterface(Audio::Mixer *mixer, TownsAudioInterfac
 }
 
 TownsAudioInterface::~TownsAudioInterface() {
-	Common::StackLock lock(_mutex);
 	reset();
 	deinit();
 	_ready = false;
diff --git a/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp b/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
index 3cf4caf0d1..b711eccbe1 100644
--- a/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
+++ b/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
@@ -1053,7 +1053,6 @@ TownsPC98_AudioDriver::TownsPC98_AudioDriver(Audio::Mixer *mixer, EmuType type)
 }
 
 TownsPC98_AudioDriver::~TownsPC98_AudioDriver() {
-	Common::StackLock lock(_mutex);
 	reset();
 	deinit();
 	_ready = false;
diff --git a/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp b/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
index 0a4984888d..dbd8e37cb7 100644
--- a/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
+++ b/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
@@ -907,6 +907,7 @@ bool TownsPC98_FmSynth::init() {
 }
 
 void TownsPC98_FmSynth::reset() {
+	Common::StackLock lock(_mutex);
 	for (int i = 0; i < _numChan; i++) {
 		for (int ii = 0; ii < 4; ii++)
 			_chanInternal[i].opr[ii]->reset();
-- 
cgit v1.2.3