From: LMH <lmh.0013@gmail.com>
Date: Thu, 29 Aug 2013 19:39:24 +0000 (-1000)
Subject: Reverted part of revision 02c347cdae86.
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=b9c8dcafba33cd26afb49fe7ed1e98c10e5cb28f;p=supertux.git

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 80373b3f8..07a3da3eb 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();