[Scummvm-git-logs] scummvm master -> ca6db6e409cc8fe20cc25d7b7a3888c796da2965

[athrxx]

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:
ca6db6e409 SCUMM: (IMUSE/Amiga) - ignore Roland GS setting for Amiga driver


Commit: ca6db6e409cc8fe20cc25d7b7a3888c796da2965
    https://github.com/scummvm/scummvm/commit/ca6db6e409cc8fe20cc25d7b7a3888c796da2965
Author: athrxx (athrxx at scummvm.org)
Date: 2021-04-10T16:02:05+02:00

Commit Message:
SCUMM: (IMUSE/Amiga) - ignore Roland GS setting for Amiga driver

(Fix for bug no. 12374 - the invalid GS setting would cause a nullptr deref)

Changed paths:
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index ba7cf7e5b6..59232223fc 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2036,7 +2036,7 @@ void ScummEngine::setupMusic(int midi) {
 			useOnlyNative = true;
 		} else if (_sound->_musicType == MDT_AMIGA) {
 			nativeMidiDriver = new IMuseDriver_Amiga(_mixer);
-			_native_mt32 = false;
+			_native_mt32 = _enable_gs = false;
 			useOnlyNative = true;
 		} else if (_sound->_musicType != MDT_ADLIB && _sound->_musicType != MDT_TOWNS && _sound->_musicType != MDT_PCSPK) {
 			nativeMidiDriver = MidiDriver::createMidi(dev);