diff options
| author | Franklin Sobrinho <franklin_gs@hotmail.com> | 2015-12-11 07:53:40 -0300 |
|---|---|---|
| committer | Franklin Sobrinho <franklin_gs@hotmail.com> | 2015-12-11 07:53:40 -0300 |
| commit | e4dce93520ce69e68fed68a4886b6f68ac3e98a7 (patch) | |
| tree | c47515f6c64c21c3b7309160a1c901b8e051eac6 | |
| parent | 5f3c87691ecf9159dae4abe741441ef170a33f44 (diff) | |
Fix error message when using is_connected with a script signal
| -rw-r--r-- | core/object.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/object.cpp b/core/object.cpp index 96f0c86832..f6ba76a0b5 100644 --- a/core/object.cpp +++ b/core/object.cpp @@ -1405,6 +1405,10 @@ bool Object::is_connected(const StringName& p_signal, Object *p_to_object, const bool signal_is_valid = ObjectTypeDB::has_signal(get_type_name(),p_signal); if (signal_is_valid) return false; + + if (!script.is_null() && Ref<Script>(script)->has_script_signal(p_signal)) + return false; + ERR_EXPLAIN("Nonexistent signal: "+p_signal); ERR_FAIL_COND_V(!s,false); } |