aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorJohannes Schickel2008-09-14 18:59:43 +0000
committerJohannes Schickel2008-09-14 18:59:43 +0000
commit78d7a276cf113b7db6eeab051c9b16fa21bb332f (patch)
tree40d0fea4b88af63edd227b32656f32dfefe6ed5e /base
parent371af753748d924f101b28edf548a69713c54168 (diff)
downloadscummvm-rg350-78d7a276cf113b7db6eeab051c9b16fa21bb332f.tar.gz
scummvm-rg350-78d7a276cf113b7db6eeab051c9b16fa21bb332f.tar.bz2
scummvm-rg350-78d7a276cf113b7db6eeab051c9b16fa21bb332f.zip
Fix for bug #2089275: "GUI: Returning to launcher may trigger an error".
svn-id: r34532
Diffstat (limited to 'base')
-rw-r--r--base/main.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/base/main.cpp b/base/main.cpp
index 897c9fe2eb..3e560aa605 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -61,6 +61,11 @@ static bool launcherDialog(OSystem &system) {
system.setGraphicsMode(ConfMan.get("gfx_mode").c_str());
system.initSize(320, 200);
+
+ if (ConfMan.hasKey("aspect_ratio"))
+ system.setFeatureState(OSystem::kFeatureAspectRatioCorrection, ConfMan.getBool("aspect_ratio"));
+ if (ConfMan.hasKey("fullscreen"))
+ system.setFeatureState(OSystem::kFeatureFullscreenMode, ConfMan.getBool("fullscreen"));
system.endGFXTransaction();
// Set initial window caption