[Scummvm-cvs-logs] CVS: scummvm/base engine.cpp,1.27,1.28

[Max Horn]

Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28983

Modified Files:
	engine.cpp 
Log Message:
Fix for bug #1082105 (GUI: ScummVM returns to window mode automatically)

Index: engine.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- engine.cpp	27 Nov 2004 00:25:57 -0000	1.27
+++ engine.cpp	12 Dec 2004 00:02:44 -0000	1.28
@@ -75,10 +75,12 @@
 	}
 	
 	// (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 {