SHERLOCK: Add mutex to Sherlock MIDI parser

Hopefully this will put a stop to random crashes when music starts
and/or stops. I'm never quite sure just how much locking is
necessary, though...

1 files changed, 6 insertions, 0 deletions

diff --git a/engines/sherlock/music.cpp b/engines/sherlock/music.cpp
index 1d4c6e08ee..470c6fafb3 100644
--- a/engines/sherlock/music.cpp
+++ b/engines/sherlock/music.cpp
@@ -21,6 +21,7 @@
  */
 
 #include "common/config-manager.h"
+#include "common/mutex.h"
 #include "sherlock/sherlock.h"
 #include "sherlock/music.h"
 #include "sherlock/scalpel/drivers/mididriver.h"
@@ -62,11 +63,14 @@ MidiParser_SH::MidiParser_SH() {
 }
 
 MidiParser_SH::~MidiParser_SH() {
+	Common::StackLock lock(_mutex);
 	unloadMusic();
 	_driver = NULL;
 }
 
 void MidiParser_SH::parseNextEvent(EventInfo &info) {
+	Common::StackLock lock(_mutex);
+
 //	warning("parseNextEvent");
 
 	// there is no delta right at the start of the music data
@@ -165,6 +169,8 @@ void MidiParser_SH::parseNextEvent(EventInfo &info) {
 }
 
 bool MidiParser_SH::loadMusic(byte *data, uint32 size) {
+	Common::StackLock lock(_mutex);
+
 	debugC(kDebugLevelMusic, "Music: loadMusic()");
 	unloadMusic();