godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-04 12:00:25 +00:00
Code Releases Wiki Activity

Fix editor crash on overrides for non-existent input mappings.

Browse Source
This commit is contained in:
Pāvels Nadtočajevs
2025-03-18 12:01:58 +02:00
parent 28102e6682
commit 57011c8948
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
editor/editor_settings.cpp
View File

@@ -191,6 +191,11 @@ bool EditorSettings::_get(const StringName &p_name, Variant &r_ret) const {
} else if (p_name == "builtin_action_overrides") { } else if (p_name == "builtin_action_overrides") {
Array actions_arr; Array actions_arr;
for (const KeyValue<String, List<Ref<InputEvent>>> &action_override : builtin_action_overrides) { for (const KeyValue<String, List<Ref<InputEvent>>> &action_override : builtin_action_overrides) {
const List<Ref<InputEvent>> *defaults = InputMap::get_singleton()->get_builtins().getptr(action_override.key);
if (!defaults) {
continue;
}
List<Ref<InputEvent>> events = action_override.value; List<Ref<InputEvent>> events = action_override.value;
Dictionary action_dict; Dictionary action_dict;
@@ -206,8 +211,7 @@ bool EditorSettings::_get(const StringName &p_name, Variant &r_ret) const {
} }
Array defaults_arr; Array defaults_arr;
List<Ref<InputEvent>> defaults = InputMap::get_singleton()->get_builtins()[action_override.key]; for (const Ref<InputEvent> &default_input_event : *defaults) {
for (const Ref<InputEvent> &default_input_event : defaults) {
if (default_input_event.is_valid()) { if (default_input_event.is_valid()) {
defaults_arr.append(default_input_event); defaults_arr.append(default_input_event);
} }