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

[athrxx at users.sourceforge.net]

Revision: 50684
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50684&view=rev
Author:   athrxx
Date:     2010-07-05 15:53:17 +0000 (Mon, 05 Jul 2010)

Log Message:
-----------
GUI/AUDIO: minor fix for the case that after enabling individual audio options for a target the gui tries to select the audio device from global options, but that particular device is unavailable due to GUIO flags settings

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

Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp	2010-07-05 15:30:41 UTC (rev 50683)
+++ scummvm/trunk/gui/options.cpp	2010-07-05 15:53:17 UTC (rev 50684)
@@ -798,7 +798,7 @@
 			for (MusicDevices::iterator d = i.begin(); d != i.end(); ++d) {
 				if (setting.empty() ? (preferredType == d->getMusicType()) : (drv == d->getCompleteId())) {
 					popup->setSelectedTag(d->getHandle());
-					return true;
+					return popup->getSelected() == -1 ? false : true;
 				}
 			}
 		}


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