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

fixed connection dialog's creation of script functions. 

Was accessing deleted objects to find the argument list.
Reordered things to get the arg list before deletion.
This commit is contained in:
Ibrahn Sahir 2018-07-13 12:58:44 +01:00
parent 1fc7973a00
commit f13f54e9db
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
editor/connections_dialog.cpp
View File

@ -428,6 +428,13 @@ void ConnectionsDock::_make_or_edit_connection() {
bool oshot = connect_dialog->get_oneshot(); bool oshot = connect_dialog->get_oneshot();
cToMake.flags = CONNECT_PERSIST | (defer ? CONNECT_DEFERRED : 0) | (oshot ? CONNECT_ONESHOT : 0); cToMake.flags = CONNECT_PERSIST | (defer ? CONNECT_DEFERRED : 0) | (oshot ? CONNECT_ONESHOT : 0);
bool add_script_function = connect_dialog->get_make_callback();
PoolStringArray script_function_args;
if (add_script_function) {
// pick up args here before "it" is deleted by update_tree
script_function_args = it->get_metadata(0).operator Dictionary()["args"];
}
if (connect_dialog->is_editing()) { if (connect_dialog->is_editing()) {
_disconnect(*it); _disconnect(*it);
_connect(cToMake); _connect(cToMake);
@ -435,9 +442,12 @@ void ConnectionsDock::_make_or_edit_connection() {
_connect(cToMake); _connect(cToMake);
} }
if (connect_dialog->get_make_callback()) { // IMPORTANT NOTE: _disconnect and _connect cause an update_tree,
PoolStringArray args = it->get_metadata(0).operator Dictionary()["args"]; // which will delete the object "it" is pointing to
editor->emit_signal("script_add_function_request", target, cToMake.method, args); it = NULL;
if (add_script_function) {
editor->emit_signal("script_add_function_request", target, cToMake.method, script_function_args);
hide(); hide();
} }