From b5d1c669158951d4ea1633d3c10c58729d28fda5 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 16 Feb 2011 23:30:03 +0100
Subject: KYRA: Set type for NULL MIDI driver to PC Speaker.

This avoids a dialog about MT-32 to General MIDI conversion shown when running
Kyrandia 1. Formerly the NULL MIDI output type was set to General MIDI, which
caused the aforementioned dialog to show up, because Kyrandia 1 has no General
MIDI tracks.
---
 engines/kyra/kyra_v1.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index fec37dccc9..3a5d21196b 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -129,10 +129,11 @@ Common::Error KyraEngine_v1::init() {
 			_sound = new SoundAdLibPC(this, _mixer);
 		} else {
 			Sound::kType type;
+			const MusicType midiType = MidiDriver::getMusicType(dev);
 
-			if (MidiDriver::getMusicType(dev) == MT_PCSPK)
+			if (midiType == MT_PCSPK || midiType == MT_NULL)
 				type = Sound::kPCSpkr;
-			else if (MidiDriver::getMusicType(dev) == MT_MT32 || ConfMan.getBool("native_mt32"))
+			else if (midiType == MT_MT32 || ConfMan.getBool("native_mt32"))
 				type = Sound::kMidiMT32;
 			else
 				type = Sound::kMidiGM;
-- 
cgit v1.2.3