From b9c8dcafba33cd26afb49fe7ed1e98c10e5cb28f Mon Sep 17 00:00:00 2001
From: LMH <lmh.0013@gmail.com>
Date: Thu, 29 Aug 2013 09:39:24 -1000
Subject: [PATCH] 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.

---
 src/supertux/main.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/supertux/main.cpp b/src/supertux/main.cpp
index 80373b3f884..07a3da3eb27 100644
--- a/src/supertux/main.cpp
+++ b/src/supertux/main.cpp
@@ -627,6 +627,9 @@ Main::run(int argc, char** argv)
     init_sdl();
     Console::instance = new Console();
 
+    timelog("controller");
+    g_jk_controller = new JoystickKeyboardController();
+
     timelog("config");
     init_config();
 
@@ -644,9 +647,6 @@ Main::run(int argc, char** argv)
     
     timelog("tinygettext");
     init_tinygettext();
-    
-    timelog("controller");
-    g_jk_controller = new JoystickKeyboardController();
 
     Console::instance->init_graphics();