From e4dce93520ce69e68fed68a4886b6f68ac3e98a7 Mon Sep 17 00:00:00 2001
From: Franklin Sobrinho <franklin_gs@hotmail.com>
Date: Fri, 11 Dec 2015 07:53:40 -0300
Subject: [PATCH] Fix error message when using is_connected with a script
 signal

---
 core/object.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/object.cpp b/core/object.cpp
index 96f0c868321..f6ba76a0b56 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);
 	}