Merge pull request #606 from Wedge009/bug_24427_fix

Restore loading of user hot-keys at start-up (bug #24427)
This commit is contained in:
gfgtdf 2016-02-20 04:12:14 +01:00
commit fe3709dba7

View file

@ -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);