[Scummvm-cvs-logs] SF.net SVN: scummvm:[41273] scummvm/trunk/engines/advancedDetector.cpp

[sev at users.sourceforge.net]

Revision: 41273
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41273&view=rev
Author:   sev
Date:     2009-06-06 17:56:59 +0000 (Sat, 06 Jun 2009)

Log Message:
-----------
Fix bug with GUI options not set when per-game setting is empty

Modified Paths:
--------------
    scummvm/trunk/engines/advancedDetector.cpp

Modified: scummvm/trunk/engines/advancedDetector.cpp
===================================================================
--- scummvm/trunk/engines/advancedDetector.cpp	2009-06-06 17:56:41 UTC (rev 41272)
+++ scummvm/trunk/engines/advancedDetector.cpp	2009-06-06 17:56:59 UTC (rev 41273)
@@ -198,7 +198,7 @@
 	if (params.flags & kADFlagUseExtraAsHint)
 		desc["extra"] = realDesc->extra;
 
-	if (realDesc->guioptions)
+	if ((realDesc->guioptions | params.guioptions) != 0)
 		desc["guioptions"] = Common::getGameGUIOptionsDescription(realDesc->guioptions | params.guioptions);
 }
 


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