1 files changed, 17 insertions, 5 deletions

diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp
index 7f93917744..da73a3930a 100644
--- a/editor/connections_dialog.cpp
+++ b/editor/connections_dialog.cpp
@@ -51,7 +51,7 @@ public:
 		if (name.begins_with("bind/")) {
 			int which = name.get_slice("/", 1).to_int() - 1;
 			ERR_FAIL_INDEX_V(which, params.size(), false);
-			params[which] = p_value;
+			params.write[which] = p_value;
 		} else
 			return false;
 
@@ -428,6 +428,13 @@ void ConnectionsDock::_make_or_edit_connection() {
 	bool oshot = connect_dialog->get_oneshot();
 	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()) {
 		_disconnect(*it);
 		_connect(cToMake);
@@ -435,9 +442,12 @@ void ConnectionsDock::_make_or_edit_connection() {
 		_connect(cToMake);
 	}
 
-	if (connect_dialog->get_make_callback()) {
-		PoolStringArray args = it->get_metadata(0).operator Dictionary()["args"];
-		editor->emit_signal("script_add_function_request", target, cToMake.method, args);
+	// IMPORTANT NOTE: _disconnect and _connect cause an update_tree,
+	// which will delete the object "it" is pointing to
+	it = NULL;
+
+	if (add_script_function) {
+		editor->emit_signal("script_add_function_request", target, cToMake.method, script_function_args);
 		hide();
 	}
 
@@ -810,7 +820,9 @@ void ConnectionsDock::update_tree() {
 					if (i > 0)
 						signaldesc += ", ";
 					String tname = "var";
-					if (pi.type != Variant::NIL) {
+					if (pi.type == Variant::OBJECT && pi.class_name != StringName()) {
+						tname = pi.class_name.operator String();
+					} else if (pi.type != Variant::NIL) {
 						tname = Variant::get_type_name(pi.type);
 					}
 					signaldesc += tname + " " + (pi.name == "" ? String("arg " + itos(i)) : pi.name);