Reverted part of revision 02c347cdae86.

Loading config before controller was causing controller settings to be lost and default keybindings/joystick mapping to be adopted.  This change reverts that part of the component loading re-order.

diff --git a/src/supertux/main.cpp b/src/supertux/main.cpp
index be8a505..d878c29 100644 (file)
--- a/src/supertux/main.cpp
+++ b/src/supertux/main.cpp
@@ -585,6 +585,9 @@ Main::run(int argc, char** argv)
     init_sdl();
     Console::instance = new Console();
 
+    timelog("controller");
+    g_jk_controller = new JoystickKeyboardController();
+
     timelog("config");
     init_config();
 
@@ -602,9 +605,6 @@ Main::run(int argc, char** argv)
     
     timelog("tinygettext");
     init_tinygettext();
-    
-    timelog("controller");
-    g_jk_controller = new JoystickKeyboardController();
 
     Console::instance->init_graphics();