godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent having spaces in signal's method in Connect Dialog 

Fixes: #39647
(cherry picked from commit 79f46da1a3)
This commit is contained in:
Dominik 'dreamsComeTrue' Jasiński 2020-06-19 01:21:46 +02:00 committed by Rémi Verschelde
parent d99f6c4d5c
commit af43748dd5
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
editor/connections_dialog.cpp
View File

@ -113,17 +113,26 @@ public:
*/ */
void ConnectDialog::ok_pressed() { void ConnectDialog::ok_pressed() {
if (dst_method->get_text() == "") { String method_name = dst_method->get_text();
if (method_name == "") {
error->set_text(TTR("Method in target node must be specified.")); error->set_text(TTR("Method in target node must be specified."));
error->popup_centered_minsize(); error->popup_centered_minsize();
return; return;
} }
if (!method_name.strip_edges().is_valid_identifier()) {
error->set_text(TTR("Method name must be a valid identifier."));
error->popup_centered();
return;
}
Node *target = tree->get_selected(); Node *target = tree->get_selected();
if (!target) { if (!target) {
return; // Nothing selected in the tree, not an error. return; // Nothing selected in the tree, not an error.
} }
if (target->get_script().is_null()) { if (target->get_script().is_null()) {
if (!target->has_method(dst_method->get_text())) { if (!target->has_method(method_name)) {
error->set_text(TTR("Target method not found. Specify a valid method or attach a script to the target node.")); error->set_text(TTR("Target method not found. Specify a valid method or attach a script to the target node."));
error->popup_centered_minsize(); error->popup_centered_minsize();
return; return;