Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
5e13c343
Unverified
Commit
5e13c343
authored
Jun 19, 2020
by
Rémi Verschelde
Committed by
GitHub
Jun 19, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #39663 from dreamsComeTrue/connect-dialog-method-name
Prevent having spaces in signal's method in Connect Dialog
parents
6d8c14f8
79f46da1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
2 deletions
+11
-2
connections_dialog.cpp
editor/connections_dialog.cpp
+11
-2
No files found.
editor/connections_dialog.cpp
View file @
5e13c343
...
@@ -108,17 +108,26 @@ public:
...
@@ -108,17 +108,26 @@ public:
* Signal automatically called by parent dialog.
* Signal automatically called by parent dialog.
*/
*/
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
();
error
->
popup_centered
();
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
();
error
->
popup_centered
();
return
;
return
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment