From ac6c99eff0f8ca155d6b2fa160eeb667395a46fa Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Wed, 27 May 2009 14:44:26 +0000
Subject: Prevent accidental MT-32 initialization for PC speaker output, when
 "native_mt32" is set to true.

svn-id: r40940
---
 engines/kyra/kyra_v1.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/kyra/kyra_v1.cpp')

diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp
index d5e0308a09..aaecef5a09 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_v1.cpp
@@ -121,10 +121,10 @@ Common::Error KyraEngine_v1::init() {
 		} else {
 			Sound::kType type;
 
-			if (midiDriver == MD_MT32 || ConfMan.getBool("native_mt32"))
-				type = Sound::kMidiMT32;
-			else if (midiDriver == MD_PCSPK)
+			if (midiDriver == MD_PCSPK)
 				type = Sound::kPCSpkr;
+			else if (midiDriver == MD_MT32 || ConfMan.getBool("native_mt32"))
+				type = Sound::kMidiMT32;
 			else
 				type = Sound::kMidiGM;
 
-- 
cgit v1.2.3