diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-12-11 09:38:41 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-12-11 09:38:41 -0300 |
| commit | 990690f9f53ec3f042d6df174fff05f2de25ca3d (patch) | |
| tree | 86d689a85016c56b4ba861852da28612abec5cf2 /core/object.cpp | |
| parent | fbda3c5d88bbe2112a257ff93caeed98f4e9873a (diff) | |
| parent | 0f57bbb8e97b3eba84e5453a5d1948d699a67515 (diff) | |
Merge branch 'master' of https://github.com/godotengine/godot
Diffstat (limited to 'core/object.cpp')
| -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); } |