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

Work-around crash situation caused by using scenario-specific tools in map context (closes #5883)

Browse source
This commit is contained in:
Wedge009 2021-09-18 12:15:36 +10:00
parent 85c434326b
commit b002444322
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/editor/controller/editor_controller.cpp
View file

@ -877,6 +877,10 @@ bool editor_controller::do_execute_command(const hotkey::hotkey_command& cmd, in
// map specific
case HOTKEY_EDITOR_MAP_CLOSE:
context_manager_->close_current_context();
// Copy behaviour from when switching windows to always reset the active tool to the Paint Tool
// This avoids the situation of having a scenario-specific tool active in a map context which can cause a crash if used
// Not elegant but at least avoids a potential crash and is consistent with existing behaviour
toolkit_->hotkey_set_mouse_action(HOTKEY_EDITOR_TOOL_PAINT);
return true;
case HOTKEY_EDITOR_MAP_LOAD:
context_manager_->load_map_dialog();