diff options
| author | Johannes Schickel | 2010-07-04 18:03:18 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-07-04 18:03:18 +0000 |
| commit | 9880017c1120eb7646c1b455a899a0d1498bb05a (patch) | |
| tree | bef8b686e917721e35a68d9e23bd02edba1770a2 | |
| parent | da1a8535b4b06072ca99a253aff55da9287672e1 (diff) | |
| download | scummvm-rg350-9880017c1120eb7646c1b455a899a0d1498bb05a.tar.gz scummvm-rg350-9880017c1120eb7646c1b455a899a0d1498bb05a.tar.bz2 scummvm-rg350-9880017c1120eb7646c1b455a899a0d1498bb05a.zip | |
Prevent the MT-32 Emulator from being displayed in the "GM Device" pop up.
svn-id: r50649
| -rw-r--r-- | gui/options.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gui/options.cpp b/gui/options.cpp index fea1ba7d29..9fd20e0d01 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -678,9 +678,10 @@ void OptionsDialog::addAudioControls(GuiObject *boss, const Common::String &pref || d->getMusicDriverId() == "auto" || d->getMusicDriverId() == "null") // always add default and null device _midiPopUp->appendEntry(d->getCompleteName(), musicId++); - if (d->getMusicType() >= MT_GM || m == p.begin()) { + if (d->getMusicType() >= MT_GM || d->getMusicDriverId() == "auto") { _mt32DevicePopUp->appendEntry(d->getCompleteName(), midiId); - _gmDevicePopUp->appendEntry(d->getCompleteName(), midiId++); + if (d->getMusicType() != MT_MT32) + _gmDevicePopUp->appendEntry(d->getCompleteName(), midiId++); } } } |