aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2009-06-06 17:56:59 +0000
committerEugene Sandulenko2009-06-06 17:56:59 +0000
commit8eb417e15e978729b6724a9e9da38b9d6897e5de (patch)
tree4dbb6ac7670a9d881a5ea3757c842ef09550d04a /engines
parent1bd6f6c99fbc3328e2405efe3fdec0dec1bf24e4 (diff)
downloadscummvm-rg350-8eb417e15e978729b6724a9e9da38b9d6897e5de.tar.gz
scummvm-rg350-8eb417e15e978729b6724a9e9da38b9d6897e5de.tar.bz2
scummvm-rg350-8eb417e15e978729b6724a9e9da38b9d6897e5de.zip
Fix bug with GUI options not set when per-game setting is empty
svn-id: r41273
Diffstat (limited to 'engines')
-rw-r--r--engines/advancedDetector.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index b6440da11a..b3ce525ff2 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -198,7 +198,7 @@ static void updateGameDescriptor(GameDescriptor &desc, const ADGameDescription *
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);
}