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

[athrxx at users.sourceforge.net]

Revision: 50646
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50646&view=rev
Author:   athrxx
Date:     2010-07-04 15:06:42 +0000 (Sun, 04 Jul 2010)

Log Message:
-----------
GUI/AUDIO: This change will make individual game audio settings take over the audio device from the global settings if no device config key is found for that game (This should fix the problem reported by LordHoto on devel. It might make sense to implement this behaviour to other settings, like subtitle mode etc.)

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

Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp	2010-07-04 14:55:28 UTC (rev 50645)
+++ scummvm/trunk/gui/options.cpp	2010-07-04 15:06:42 UTC (rev 50646)
@@ -803,8 +803,8 @@
 	if (!popup || !popup->isEnabled())
 		return true;
 
-	if (ConfMan.hasKey(setting, _domain) || preferredType) {
-		const Common::String drv = ConfMan.get(setting, _domain);
+	if (_domain != Common::ConfigManager::kApplicationDomain || ConfMan.hasKey(setting, _domain) || preferredType) {
+		const Common::String drv = ConfMan.get(setting, (_domain != Common::ConfigManager::kApplicationDomain && !ConfMan.hasKey(setting, _domain)) ? Common::ConfigManager::kApplicationDomain : _domain); 
 		const MusicPlugin::List p = MusicMan.getPlugins();
 		int id = 0;
 		for (MusicPlugin::List::const_iterator m = p.begin(); m != p.end() && id != -1; m++) {


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