Merge pull request #9980 from karroffel/nativescript-baseclass-signal-fix

[NativeScript] fix signals from base class not being accessible
2017-07-30 15:55:35 +02:00
parent 597e5ebedf fc9f5d59b5
commit f1fe2cd90e
1 changed files with 7 additions and 3 deletions
@@ -288,9 +288,13 @@ ScriptLanguage *NativeScript::get_language() const {

 bool NativeScript::has_script_signal(const StringName &p_signal) const {
 	NativeScriptDesc *script_data = get_script_desc();
-	if (!script_data)
-		return false;
-	return script_data->signals_.has(p_signal);
+
+	while (script_data) {
+		if (script_data->signals_.has(p_signal))
+			return true;
+		script_data = script_data->base_data;
+	}
+	return false;
 }

 void NativeScript::get_script_signal_list(List<MethodInfo> *r_signals) const {