Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 13:49:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #112857 from ryevdokimov/project-manager-shortcut-crash

Browse source 
Fix modifiying shortcuts in project manager causing crash
This commit is contained in:
Thaddeus Crews 2025-12-03 11:42:28 -06:00
commit 9eab056f8d
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
1 changed files with 41 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

66
editor/settings/editor_settings_dialog.cpp
View file

@ -349,36 +349,52 @@ void EditorSettingsDialog::_update_builtin_action(const String &p_name, const Ar
old_input_array = _event_list_to_array_helper(defaults); old_input_array = _event_list_to_array_helper(defaults);
} }
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton(); if (_is_in_project_manager()) {
undo_redo->create_action(vformat(TTR("Edit Built-in Action: %s"), p_name)); // Project Manager doesn't have EditorUndoRedoManager, so apply changes directly.
undo_redo->add_do_method(EditorSettings::get_singleton(), "mark_setting_changed", "builtin_action_overrides"); EditorSettings::get_singleton()->mark_setting_changed("builtin_action_overrides");
undo_redo->add_undo_method(EditorSettings::get_singleton(), "mark_setting_changed", "builtin_action_overrides"); EditorSettings::get_singleton()->set_builtin_action_override(p_name, p_events);
undo_redo->add_do_method(EditorSettings::get_singleton(), "set_builtin_action_override", p_name, p_events); _update_shortcuts();
undo_redo->add_undo_method(EditorSettings::get_singleton(), "set_builtin_action_override", p_name, old_input_array); _settings_changed();
undo_redo->add_do_method(this, "_update_shortcuts"); } else {
undo_redo->add_undo_method(this, "_update_shortcuts"); EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
undo_redo->add_do_method(this, "_settings_changed"); undo_redo->create_action(vformat(TTR("Edit Built-in Action: %s"), p_name));
undo_redo->add_undo_method(this, "_settings_changed"); undo_redo->add_do_method(EditorSettings::get_singleton(), "mark_setting_changed", "builtin_action_overrides");
undo_redo->commit_action(); undo_redo->add_undo_method(EditorSettings::get_singleton(), "mark_setting_changed", "builtin_action_overrides");
undo_redo->add_do_method(EditorSettings::get_singleton(), "set_builtin_action_override", p_name, p_events);
undo_redo->add_undo_method(EditorSettings::get_singleton(), "set_builtin_action_override", p_name, old_input_array);
undo_redo->add_do_method(this, "_update_shortcuts");
undo_redo->add_undo_method(this, "_update_shortcuts");
undo_redo->add_do_method(this, "_settings_changed");
undo_redo->add_undo_method(this, "_settings_changed");
undo_redo->commit_action();
}
} }
void EditorSettingsDialog::_update_shortcut_events(const String &p_path, const Array &p_events) { void EditorSettingsDialog::_update_shortcut_events(const String &p_path, const Array &p_events) {
Ref<Shortcut> current_sc = EditorSettings::get_singleton()->get_shortcut(p_path); Ref<Shortcut> current_sc = EditorSettings::get_singleton()->get_shortcut(p_path);
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton(); if (_is_in_project_manager()) {
undo_redo->create_action(vformat(TTR("Edit Shortcut: %s"), p_path), UndoRedo::MERGE_DISABLE, EditorSettings::get_singleton()); // Project Manager doesn't have EditorUndoRedoManager, so apply changes directly.
// History must be fixed based on the EditorSettings object because current_sc would current_sc->set_events(p_events);
// incorrectly make this action use the scene history. EditorSettings::get_singleton()->mark_setting_changed("shortcuts");
undo_redo->force_fixed_history(); _update_shortcuts();
undo_redo->add_do_method(current_sc.ptr(), "set_events", p_events); _settings_changed();
undo_redo->add_undo_method(current_sc.ptr(), "set_events", current_sc->get_events()); } else {
undo_redo->add_do_method(EditorSettings::get_singleton(), "mark_setting_changed", "shortcuts"); EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();
undo_redo->add_undo_method(EditorSettings::get_singleton(), "mark_setting_changed", "shortcuts"); undo_redo->create_action(vformat(TTR("Edit Shortcut: %s"), p_path), UndoRedo::MERGE_DISABLE, EditorSettings::get_singleton());
undo_redo->add_do_method(this, "_update_shortcuts"); // History must be fixed based on the EditorSettings object because current_sc would
undo_redo->add_undo_method(this, "_update_shortcuts"); // incorrectly make this action use the scene history.
undo_redo->add_do_method(this, "_settings_changed"); undo_redo->force_fixed_history();
undo_redo->add_undo_method(this, "_settings_changed"); undo_redo->add_do_method(current_sc.ptr(), "set_events", p_events);
undo_redo->commit_action(); undo_redo->add_undo_method(current_sc.ptr(), "set_events", current_sc->get_events());
undo_redo->add_do_method(EditorSettings::get_singleton(), "mark_setting_changed", "shortcuts");
undo_redo->add_undo_method(EditorSettings::get_singleton(), "mark_setting_changed", "shortcuts");
undo_redo->add_do_method(this, "_update_shortcuts");
undo_redo->add_undo_method(this, "_update_shortcuts");
undo_redo->add_do_method(this, "_settings_changed");
undo_redo->add_undo_method(this, "_settings_changed");
undo_redo->commit_action();
}
bool path_is_orbit_mod = p_path == "spatial_editor/viewport_orbit_modifier_1" || p_path == "spatial_editor/viewport_orbit_modifier_2"; bool path_is_orbit_mod = p_path == "spatial_editor/viewport_orbit_modifier_1" || p_path == "spatial_editor/viewport_orbit_modifier_2";
bool path_is_pan_mod = p_path == "spatial_editor/viewport_pan_modifier_1" || p_path == "spatial_editor/viewport_pan_modifier_2"; bool path_is_pan_mod = p_path == "spatial_editor/viewport_pan_modifier_1" || p_path == "spatial_editor/viewport_pan_modifier_2";