[Scummvm-git-logs] scummvm master -> 811a80d279c660c4ae0c651443d3e16dc42cc9ca

[ccawley2011]

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:
811a80d279 DS: Fix crash on exit


Commit: 811a80d279c660c4ae0c651443d3e16dc42cc9ca
    https://github.com/scummvm/scummvm/commit/811a80d279c660c4ae0c651443d3e16dc42cc9ca
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-08-26T17:05:14+01:00

Commit Message:
DS: Fix crash on exit

Changed paths:
    backends/mixer/maxmod/maxmod-mixer.cpp


diff --git a/backends/mixer/maxmod/maxmod-mixer.cpp b/backends/mixer/maxmod/maxmod-mixer.cpp
index 6cec007a2f..c5ab6921ce 100644
--- a/backends/mixer/maxmod/maxmod-mixer.cpp
+++ b/backends/mixer/maxmod/maxmod-mixer.cpp
@@ -42,7 +42,10 @@ MaxModMixerManager::MaxModMixerManager(int freq, int bufSize)
 }
 
 MaxModMixerManager::~MaxModMixerManager() {
-	_mixer->setReady(false);
+	// HACK: This is called during the OSystem destructor, but Audio::MixerImpl calls
+	// mutex functions from OSystem during its destructor, which causes a crash.
+	// _mixer->setReady(false);
+	_mixer = 0;
 	mmStreamClose();
 }