[Scummvm-git-logs] scummvm master -> 2a13273e5caf4b3022e171814bfa033f12a5c5bc

[AndywinXp]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2a13273e5c SCUMM: DiMUSE: Remove unnecessary mutex call causing softlocks


Commit: 2a13273e5caf4b3022e171814bfa033f12a5c5bc
    https://github.com/scummvm/scummvm/commit/2a13273e5caf4b3022e171814bfa033f12a5c5bc
Author: AndywinXp (andywinxp at gmail.com)
Date: 2022-07-28T00:16:17+02:00

Commit Message:
SCUMM: DiMUSE: Remove unnecessary mutex call causing softlocks

The call was unnecessary since the one being fundamental is the call made
to the resource manager mutex in _vm->getResourceAddress(); this fixes
some very rare (but also very real) cases of v7-8 games softlocking.

Changed paths:
    engines/scumm/imuse_digi/dimuse_files.cpp


diff --git a/engines/scumm/imuse_digi/dimuse_files.cpp b/engines/scumm/imuse_digi/dimuse_files.cpp
index 0a36a39dc08..b98f5957c29 100644
--- a/engines/scumm/imuse_digi/dimuse_files.cpp
+++ b/engines/scumm/imuse_digi/dimuse_files.cpp
@@ -98,7 +98,6 @@ uint8 *IMuseDigiFilesHandler::getSoundAddrData(int soundId) {
 	if (_engine->isEngineDisabled())
 		return nullptr;
 
-	Common::StackLock lock(_mutex);
 	// This function is always used for SFX (tracks which do not
 	// have a stream pointer), hence the use of the resource address
 	if (soundId != 0) {