Skip to content

Commit

Permalink
Reverted part of revision 02c347c.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
LMH0013 authored and tobbi committed Oct 26, 2013
1 parent 430e4dc commit b9c8dca
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/supertux/main.cpp
Expand Up @@ -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();

Expand All @@ -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();

Expand Down

0 comments on commit b9c8dca

Please sign in to comment.