From f5559de703a2deca65f6a716fdf6e68aa7413607 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 20 Mar 2007 18:59:28 +0000
Subject: Fix a potential race condition (leading to lockups) in
 IMuseDigital::refreshScripts

svn-id: r26254
---
 engines/scumm/imuse_digi/dimuse_script.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'engines/scumm/imuse_digi/dimuse_script.cpp')

diff --git a/engines/scumm/imuse_digi/dimuse_script.cpp b/engines/scumm/imuse_digi/dimuse_script.cpp
index 1a257c905f..ad976e3300 100644
--- a/engines/scumm/imuse_digi/dimuse_script.cpp
+++ b/engines/scumm/imuse_digi/dimuse_script.cpp
@@ -189,16 +189,20 @@ void IMuseDigital::flushTracks() {
 }
 
 void IMuseDigital::refreshScripts() {
-	Common::StackLock lock(_mutex, "IMuseDigital::refreshScripts()");
-	debug(5, "refreshScripts()");
-	bool found = false;
-	for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
-		Track *track = _track[l];
-		if (track->used && !track->toBeRemoved && (track->volGroupId == IMUSE_VOLGRP_MUSIC)) {
-			found = true;
+	{
+		Common::StackLock lock(_mutex, "IMuseDigital::refreshScripts()");
+		debug(5, "refreshScripts()");
+		bool found = false;
+		for (int l = 0; l < MAX_DIGITAL_TRACKS; l++) {
+			Track *track = _track[l];
+			if (track->used && !track->toBeRemoved && (track->volGroupId == IMUSE_VOLGRP_MUSIC)) {
+				found = true;
+			}
 		}
 	}
-
+	
+	// Make sure parseScriptCmds is *not* called while the mutex is locked
+	// (else race conditions can occur).
 	if (!found && (_curMusicSeq != 0)) {
 		debug(5, "refreshScripts() Start Sequence");
 		parseScriptCmds(0x1001, 0, 0, 0, 0, 0, 0, 0);
-- 
cgit v1.2.3