From 5737e7dd2dac03e04d1c17cb1f4afedc956b48e2 Mon Sep 17 00:00:00 2001 From: Marcel Admiraal Date: Tue, 28 Dec 2021 17:08:06 +0000 Subject: Check if action name exists before adding it or renaming an action to it --- editor/action_map_editor.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'editor/action_map_editor.cpp') diff --git a/editor/action_map_editor.cpp b/editor/action_map_editor.cpp index eabe0a95e2..96d9ab1064 100644 --- a/editor/action_map_editor.cpp +++ b/editor/action_map_editor.cpp @@ -760,12 +760,26 @@ void ActionMapEditor::_add_action_pressed() { _add_action(add_edit->get_text()); } +bool ActionMapEditor::_has_action(const String &p_name) const { + for (const ActionInfo &action_info : actions_cache) { + if (p_name == action_info.name) { + return true; + } + } + return false; +} + void ActionMapEditor::_add_action(const String &p_name) { if (p_name.is_empty() || !_is_action_name_valid(p_name)) { show_message(TTR("Invalid action name. It cannot be empty nor contain '/', ':', '=', '\\' or '\"'")); return; } + if (_has_action(p_name)) { + show_message(vformat(TTR("An action with the name '%s' already exists."), p_name)); + return; + } + add_edit->clear(); emit_signal(SNAME("action_added"), p_name); } @@ -791,6 +805,12 @@ void ActionMapEditor::_action_edited() { return; } + if (_has_action(new_name)) { + ti->set_text(0, old_name); + show_message(vformat(TTR("An action with the name '%s' already exists."), new_name)); + return; + } + emit_signal(SNAME("action_renamed"), old_name, new_name); } else if (action_tree->get_selected_column() == 1) { // Deadzone Edited -- cgit v1.2.3