aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorMax Horn2003-08-03 22:51:22 +0000
committerMax Horn2003-08-03 22:51:22 +0000
commit5a9fe8212129b1ba46127cdd5cc6ad75fcbb4812 (patch)
tree98bf202c4f45dd4400d0f62115072f4d3093419b /common
parentb63088268357882625fe5fa767f687f3202af72b (diff)
downloadscummvm-rg350-5a9fe8212129b1ba46127cdd5cc6ad75fcbb4812.tar.gz
scummvm-rg350-5a9fe8212129b1ba46127cdd5cc6ad75fcbb4812.tar.bz2
scummvm-rg350-5a9fe8212129b1ba46127cdd5cc6ad75fcbb4812.zip
fix for bug #782132 (MI1: -e null doesn't work)
svn-id: r9445
Diffstat (limited to 'common')
-rw-r--r--common/gameDetector.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/gameDetector.cpp b/common/gameDetector.cpp
index 3d6c7d06e6..3dac267cf4 100644
--- a/common/gameDetector.cpp
+++ b/common/gameDetector.cpp
@@ -693,8 +693,8 @@ 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) ||
- ((_game.adlib & VersionSettings::ADLIB_PREFERRED) && _midi_driver == MD_AUTO)) {
+ if ((_game.adlib & VersionSettings::ADLIB_ALWAYS) && _midi_driver != MD_NULL ||
+ (_game.adlib & VersionSettings::ADLIB_PREFERRED) && _midi_driver == MD_AUTO) {
_midi_driver = MD_ADLIB;
_use_adlib = true;
}