diff options
| author | Florian Kagerer | 2010-06-27 17:37:35 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2010-06-27 17:37:35 +0000 |
| commit | 7e05376ebe3f82420e26941b4b74883c95060d00 (patch) | |
| tree | 28bf8fd84326e95669f7b4b7c9546194fec20eaa | |
| parent | 5997307081db72c002a9a131d0eefc1a190e1ced (diff) | |
| download | scummvm-rg350-7e05376ebe3f82420e26941b4b74883c95060d00.tar.gz scummvm-rg350-7e05376ebe3f82420e26941b4b74883c95060d00.tar.bz2 scummvm-rg350-7e05376ebe3f82420e26941b4b74883c95060d00.zip | |
GUI: and another fix for the music device popup
svn-id: r50384
| -rw-r--r-- | gui/options.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gui/options.cpp b/gui/options.cpp index 7f132f32f1..74eda9bdfc 100644 --- a/gui/options.cpp +++ b/gui/options.cpp @@ -141,7 +141,7 @@ template<class T> bool equalsDeviceProperty(MusicDevices::iterator d, T lookupPr } bool musicDeviceSkipSettingDefault(MusicDevices::iterator d, Common::String dom, MusicPlugin::List::const_iterator &m, uint32 guio) { - return (dom == Common::ConfigManager::kApplicationDomain && d->getMusicType() != MT_TOWNS) || (dom != Common::ConfigManager::kApplicationDomain && (!guio || (guio & (MidiDriver::musicType2GUIO(d->getMusicType()))))) || d->getMusicDriverId() == "auto" || d->getMusicDriverId() == "null" ? true : false; + return (dom == Common::ConfigManager::kApplicationDomain && d->getMusicType() != MT_TOWNS) || (dom != Common::ConfigManager::kApplicationDomain && (!(guio & MidiDriver::musicType2GUIO((uint32)-1)) || (guio & (MidiDriver::musicType2GUIO(d->getMusicType()))))) || d->getMusicDriverId() == "auto" || d->getMusicDriverId() == "null" ? true : false; } bool musicDeviceSkipSettingSpec(MusicDevices::iterator d, Common::String, MusicPlugin::List::const_iterator &m, uint32) { |