From 32ccf306f9a820e2ac5811de7c12e99a736fdf05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Fri, 28 Feb 2020 14:32:36 +0100
Subject: ConnectionsDock: Fix error when parsing CustomCallable connections

---
 core/callable.cpp             | 4 +++-
 editor/connections_dialog.cpp | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/callable.cpp b/core/callable.cpp
index 34b79cea10..4a5ae3a248 100644
--- a/core/callable.cpp
+++ b/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();
diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp
index 304d6d1ea9..eea92fb7ed 100644
--- a/editor/connections_dialog.cpp
+++ b/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)
-- 
cgit v1.2.3