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

ConnectionsDock: Fix error when parsing CustomCallable connections

Browse Source
This commit is contained in:
Rémi Verschelde 2020-02-28 14:32:36 +01:00
parent 09a6a2d8f8
commit 32ccf306f9
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/callable.cpp
View File

@ -73,9 +73,11 @@ ObjectID Callable::get_object_id() const {
} }
} }
StringName Callable::get_method() 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; return method;
} }
uint32_t Callable::hash() const { uint32_t Callable::hash() const {
if (is_custom()) { if (is_custom()) {
return custom->hash(); return custom->hash();

5
editor/connections_dialog.cpp
View File

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