summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2016-06-22 07:52:23 +0200
committerGitHub <noreply@github.com>2016-06-22 07:52:23 +0200
commit0266d752b3e0b2c5d5234ffd16ea19709bd0c8dd (patch)
tree46cbe691a884b334a642a4d4a85161715b064968
parent87cb3629f2ae34ee65b2edaa52199c302d14f4e2 (diff)
parent621b8d132431506b4b686a77a72f240095b6b1c7 (diff)
Merge pull request #5333 from J08nY/signal-list-fix
Object: get_signal_connection_list fixed
-rw-r--r--core/object.cpp18
1 files changed, 10 insertions, 8 deletions
diff --git a/core/object.cpp b/core/object.cpp
index 34d6d8487a..99d4a1f46a 100644
--- a/core/object.cpp
+++ b/core/object.cpp
@@ -1320,14 +1320,16 @@ Array Object::_get_signal_connection_list(const String& p_signal) const{
for (List<Connection>::Element *E=conns.front();E;E=E->next()) {
Connection &c=E->get();
- Dictionary rc;
- rc["signal"]=c.signal;
- rc["method"]=c.method;
- rc["source"]=c.source;
- rc["target"]=c.target;
- rc["binds"]=c.binds;
- rc["flags"]=c.flags;
- ret.push_back(rc);
+ if (c.signal == p_signal){
+ Dictionary rc;
+ rc["signal"]=c.signal;
+ rc["method"]=c.method;
+ rc["source"]=c.source;
+ rc["target"]=c.target;
+ rc["binds"]=c.binds;
+ rc["flags"]=c.flags;
+ ret.push_back(rc);
+ }
}
return ret;