From dab9c05783c56f6c0b0b3faf65921992bc953954 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 10 Jul 2011 16:21:30 +0200
Subject: SCUMM: Do not allow multi midi mode for PC Speaker output.

Thanks to eriktorbjorn for catching this.
---
 engines/scumm/scumm.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 22b02e8e03..5268231cff 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1862,7 +1862,7 @@ void ScummEngine::setupMusic(int midi) {
 			nativeMidiDriver = MidiDriver::createMidi(dev);
 		if (nativeMidiDriver != NULL && _native_mt32)
 			nativeMidiDriver->property(MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
-		bool multi_midi = ConfMan.getBool("multi_midi") && _musicType != MDT_NONE && (midi & MDT_ADLIB);
+		bool multi_midi = ConfMan.getBool("multi_midi") && _musicType != MDT_NONE && _musicType != MDT_PCSPK && (midi & MDT_ADLIB);
 		if (_musicType == MDT_ADLIB || _musicType == MDT_TOWNS || multi_midi) {
 			adlibMidiDriver = MidiDriver::createMidi(MidiDriver::detectDevice(_musicType == MDT_TOWNS ? MDT_TOWNS : MDT_ADLIB));
 			adlibMidiDriver->property(MidiDriver::PROP_OLD_ADLIB, (_game.features & GF_SMALL_HEADER) ? 1 : 0);
-- 
cgit v1.2.3