Browse Source

ConnectionsDock: Fix error when parsing CustomCallable connections

Rémi Verschelde 5 years ago
parent
commit
32ccf306f9
2 changed files with 6 additions and 3 deletions
  1. 3 1
      core/callable.cpp
  2. 3 2
      editor/connections_dialog.cpp

+ 3 - 1
core/callable.cpp

@@ -73,9 +73,11 @@ ObjectID Callable::get_object_id() const {
 	}
 }
 StringName Callable::get_method() const {
-	ERR_FAIL_COND_V(is_custom(), StringName());
+	ERR_FAIL_COND_V_MSG(is_custom(), StringName(),
+			vformat("Can't get method on CallableCustom \"%s\".", operator String()));
 	return method;
 }
+
 uint32_t Callable::hash() const {
 	if (is_custom()) {
 		return custom->hash();

+ 3 - 2
editor/connections_dialog.cpp

@@ -1015,9 +1015,10 @@ void ConnectionsDock::update_tree() {
 
 			for (List<Object::Connection>::Element *F = connections.front(); F; F = F->next()) {
 
-				ConnectDialog::ConnectionData c = F->get();
-				if (!(c.flags & CONNECT_PERSIST))
+				Connection cn = F->get();
+				if (!(cn.flags & CONNECT_PERSIST))
 					continue;
+				ConnectDialog::ConnectionData c = cn;
 
 				Node *target = Object::cast_to<Node>(c.target);
 				if (!target)