Merge pull request #606 from Wedge009/bug_24427_fix

Restore loading of user hot-keys at start-up (bug #24427)
wesnoth · Feb 20, 2016 · fe3709d · fe3709d
2 parents da86bcb + 964d7bb
commit fe3709d
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/wesnoth.cpp b/src/wesnoth.cpp
@@ -770,6 +770,8 @@ static int do_gameloop(const std::vector<std::string>& args)
 				? gui2::ttitle_screen::LOAD_GAME
 				: gui2::ttitle_screen::NOTHING;
 
+		preferences::load_hotkeys();
+
 		const font::floating_label_context label_manager;
 
 		cursor::set(cursor::NORMAL);