0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix an intermittent crash with keyboard input during the load screen

Browse source
This commit is contained in:
Steve Cotton 2021-06-28 11:49:11 +02:00
parent 45625b0cf5
commit fc0b764403
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.md
View file

@ -13,6 +13,7 @@
### User interface
### WML Engine
### Miscellaneous and Bug Fixes
* Fixed: keyboard input during the loading screen intermittently caused a crash (issue #4447)
## Version 1.15.14
### Add-ons client

14
src/game_config_manager.cpp
View file

@ -111,12 +111,16 @@ bool game_config_manager::init_game_config(FORCE_RELOAD_CONFIG force_reload)
game_config::load_config(game_config().child("game_config"));
hotkey::deactivate_all_scopes();
hotkey::set_scope_active(hotkey::SCOPE_MAIN_MENU);
// It's necessary to block the event thread while load_hotkeys() runs, otherwise keyboard input
// can cause a crash by accessing the list of hotkeys while it's being modified.
events::call_in_main_thread([this]() {
hotkey::deactivate_all_scopes();
hotkey::set_scope_active(hotkey::SCOPE_MAIN_MENU);
// Load the standard hotkeys, then apply any player customizations.
hotkey::load_hotkeys(game_config(), true);
preferences::load_hotkeys();
// Load the standard hotkeys, then apply any player customizations.
hotkey::load_hotkeys(game_config(), true);
preferences::load_hotkeys();
});
// TODO: consider making this part of preferences::manager in some fashion
preferences::init_advanced_manager(game_config());