From bfde325d35089c329334fb6e6e8263dbdd42136b Mon Sep 17 00:00:00 2001
From: Jamieson Christian
Date: Wed, 13 Aug 2003 15:34:00 +0000
Subject: Fix ALWAYS_ADLIB override of native driver selection

svn-id: r9658
---
 common/gameDetector.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'common')

diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp
index 7f211a0487..9a4fa6fc32 100644
--- a/common/gameDetector.cpp
+++ b/common/gameDetector.cpp
@@ -704,7 +704,10 @@ int GameDetector::detectMain() {
 	 * and the game is one of those that want adlib as
 	 * default, OR if the game is an older game that doesn't
 	 * support anything else anyway. */
-	if ((_game.adlib & VersionSettings::ADLIB_ALWAYS) && _midi_driver != MD_NULL ||
+	bool nativeMidiDriver =
+		(_midi_driver != MD_NULL && _midi_driver != MD_ADLIB &&
+		 _midi_driver != MD_PCSPK && _midi_driver != MD_PCJR);
+	if ((_game.adlib & VersionSettings::ADLIB_ALWAYS) && nativeMidiDriver ||
 	    (_game.adlib & VersionSettings::ADLIB_PREFERRED) && _midi_driver == MD_AUTO) {
 		_midi_driver = MD_ADLIB;
 	}
-- 
cgit v1.2.3