Make sure our config default values get properly registered

svn-id: r22345

3 files changed, 6 insertions, 3 deletions

diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index 52be4dcf80..1adf73f9b4 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -150,7 +150,7 @@ static void usage(const char *s, ...) {
 	exit(1);
 }
 
-GameDetector::GameDetector() {
+void GameDetector::registerDefaults() {
 
 	// Graphics
 	ConfMan.registerDefault("fullscreen", false);
diff --git a/base/gameDetector.h b/base/gameDetector.h
index 48714a73d3..89793cf48c 100644
--- a/base/gameDetector.h
+++ b/base/gameDetector.h
@@ -35,8 +35,8 @@ class GameDetector {
 	typedef Common::String String;
 
 public:
-	GameDetector();
-
+	static void registerDefaults();
+	
 	static Common::String parseCommandLine(Common::StringMap &settings, int argc, char **argv);
 	static void processSettings(Common::String &target, Common::StringMap &settings);
 	static const Plugin *detectMain();
diff --git a/base/main.cpp b/base/main.cpp
index 8ea0dd2688..dc7546d73f 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -323,6 +323,9 @@ extern "C" int scummvm_main(int argc, char *argv[]) {
 	// Verify that the backend has been initialized (i.e. g_system has been set).
 	assert(g_system);
 	OSystem &system = *g_system;
+	
+	// Register config manager defaults
+	GameDetector::registerDefaults();
 
 	// Parse the command line
 	Common::StringMap settings;