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

[lordhoto at users.sourceforge.net]

Revision: 40506
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40506&view=rev
Author:   lordhoto
Date:     2009-05-12 19:36:09 +0000 (Tue, 12 May 2009)

Log Message:
-----------
Fix invalid pop up widget selection, when no "opl_driver" setting is present.

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

Modified: scummvm/trunk/gui/options.cpp
===================================================================
--- scummvm/trunk/gui/options.cpp	2009-05-12 19:33:03 UTC (rev 40505)
+++ scummvm/trunk/gui/options.cpp	2009-05-12 19:36:09 UTC (rev 40506)
@@ -183,8 +183,10 @@
 		_midiPopUp->setSelectedTag(id);
 	}
 
-	if (_oplPopUp)
-		_oplPopUp->setSelectedTag(OPL::Config::parse(ConfMan.get("opl_driver", _domain)));
+	if (_oplPopUp) {
+		OPL::Config::DriverId id = MAX<OPL::Config::DriverId>(OPL::Config::parse(ConfMan.get("opl_driver", _domain)), 0);
+		_oplPopUp->setSelectedTag(id);
+	}
 
 	if (_outputRatePopUp) {
 		_outputRatePopUp->setSelected(1);


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