[Scummvm-cvs-logs] SF.net SVN: scummvm:[50384] scummvm/trunk/gui/options.cpp

[athrxx at users.sourceforge.net]

Revision: 50384
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50384&view=rev
Author:   athrxx
Date:     2010-06-27 17:37:35 +0000 (Sun, 27 Jun 2010)

Log Message:
-----------
GUI: and another fix for the music device popup

Modified Paths:
--------------
    scummvm/trunk/gui/options.cpp

Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp	2010-06-27 17:06:26 UTC (rev 50383)
+++ scummvm/trunk/gui/options.cpp	2010-06-27 17:37:35 UTC (rev 50384)
@@ -141,7 +141,7 @@
 }
 
 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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.