[Scummvm-git-logs] scummvm master -> 7694db025e8a58d8c99321069e862a97b266e78d

[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:
7694db025e SCUMM: (IMS/MAC) - fix bug no. 14310


Commit: 7694db025e8a58d8c99321069e862a97b266e78d
    https://github.com/scummvm/scummvm/commit/7694db025e8a58d8c99321069e862a97b266e78d
Author: athrxx (athrxx at scummvm.org)
Date: 2023-03-13T19:24:16+01:00

Commit Message:
SCUMM: (IMS/MAC) - fix bug no. 14310

(manually set gs flag to false, just the same way we do for Amiga)

Changed paths:
    engines/scumm/imuse/imuse.cpp
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/imuse/imuse.cpp b/engines/scumm/imuse/imuse.cpp
index b912f54e694..547b4be9c55 100644
--- a/engines/scumm/imuse/imuse.cpp
+++ b/engines/scumm/imuse/imuse.cpp
@@ -366,7 +366,7 @@ void IMuseInternal::pause(bool paused) {
 	// The result is hanging notes on pause. Reportedly
 	// happens in the original distro, too. To fix that,
 	// just send AllNotesOff to the channels.
-	if (_midi_native && _native_mt32) {
+ 	if (_midi_native && _native_mt32) {
 		for (int i = 0; i < 16; ++i)
 			_midi_native->send(123 << 8 | 0xB0 | i);
 	}
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index aef3db84340..5afe9e21b6f 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -2136,7 +2136,7 @@ void ScummEngine::setupMusic(int midi, const Common::String &macInstrumentFile)
 			// of the Mac music via a selected MIDI device.
 			nativeMidiDriver = new IMuseDriver_MacM68k(_mixer);
 			// The Mac driver is never MT-32.
-			_native_mt32 = false;
+			_native_mt32 = enable_gs = false;
 			// Ignore non-native drivers. This also ignores the multi MIDI setting.
 			useOnlyNative = true;
 		} else if (_sound->_musicType == MDT_AMIGA) {