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

Check if action name exists before adding it or renaming an action to it

Browse Source
This commit is contained in:
Marcel Admiraal
2021-12-28 17:08:06 +00:00
parent a7839df869
commit 5737e7dd2d
3 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
editor/project_settings_editor.cpp
View File

@@ -275,10 +275,8 @@ void ProjectSettingsEditor::_editor_restart_close() {
void ProjectSettingsEditor::_action_added(const String &p_name) {
String name = "input/" + p_name;
if (ProjectSettings::get_singleton()->has_setting(name)) {
action_map->show_message(vformat(TTR("An action with the name '%s' already exists."), name));
return;
}
ERR_FAIL_COND_MSG(ProjectSettings::get_singleton()->has_setting(name),
"An action with this name already exists.");
Dictionary action;
action["events"] = Array();
@@ -351,10 +349,8 @@ void ProjectSettingsEditor::_action_renamed(const String &p_old_name, const Stri
const String old_property_name = "input/" + p_old_name;
const String new_property_name = "input/" + p_new_name;
if (ProjectSettings::get_singleton()->has_setting(new_property_name)) {
action_map->show_message(vformat(TTR("An action with the name '%s' already exists."), new_property_name));
return;
}
ERR_FAIL_COND_MSG(ProjectSettings::get_singleton()->has_setting(new_property_name),
"An action with this name already exists.");
int order = ProjectSettings::get_singleton()->get_order(old_property_name);
Dictionary action = ProjectSettings::get_singleton()->get(old_property_name);