aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorMax Horn2004-12-12 00:02:44 +0000
committerMax Horn2004-12-12 00:02:44 +0000
commit791db21a6cdb1a284e703d436c7851d68ab0e225 (patch)
tree1434f875884b6e4e34dc425e2f2fb60cfed93468 /base
parent41a7e6674cface371c1a923beb3c955d711eb042 (diff)
downloadscummvm-rg350-791db21a6cdb1a284e703d436c7851d68ab0e225.tar.gz
scummvm-rg350-791db21a6cdb1a284e703d436c7851d68ab0e225.tar.bz2
scummvm-rg350-791db21a6cdb1a284e703d436c7851d68ab0e225.zip
Fix for bug #1082105 (GUI: ScummVM returns to window mode automatically)
svn-id: r16038
Diffstat (limited to 'base')
-rw-r--r--base/engine.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/base/engine.cpp b/base/engine.cpp
index 689b4ad4b1..22b80e1153 100644
--- a/base/engine.cpp
+++ b/base/engine.cpp
@@ -75,10 +75,12 @@ void Engine::initCommonGFX(GameDetector &detector) {
}
// (De)activate aspect-ratio correction as determined by the config settings
- _system->setFeatureState(OSystem::kFeatureAspectRatioCorrection, ConfMan.getBool("aspect_ratio"));
+ if (ConfMan.hasKey("aspect_ratio", detector._targetName))
+ _system->setFeatureState(OSystem::kFeatureAspectRatioCorrection, ConfMan.getBool("aspect_ratio"));
// (De)activate fullscreen mode as determined by the config settings
- _system->setFeatureState(OSystem::kFeatureFullscreenMode, ConfMan.getBool("fullscreen"));
+ if (ConfMan.hasKey("fullscreen", detector._targetName))
+ _system->setFeatureState(OSystem::kFeatureFullscreenMode, ConfMan.getBool("fullscreen"));
}
const char *Engine::getGameDataPath() const {