Merge pull request #180 from limbonaut/fix-changed-already-connected

Fix error if `changed` signal is already connected in several tasks

bt/tasks/blackboard/bt_check_var.cpp

@@ -24,8 +24,9 @@ void BTCheckVar::set_check_type(LimboUtility::CheckType p_check_type) {
 void BTCheckVar::set_value(const Ref<BBVariant> &p_value) {
 	value = p_value;
 	emit_changed();
-	if (Engine::get_singleton()->is_editor_hint() && value.is_valid()) {
-		value->connect(LW_NAME(changed), Callable(this, LW_NAME(emit_changed)));
+	if (Engine::get_singleton()->is_editor_hint() && value.is_valid() &&
+			!value->is_connected(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed))) {
+		value->connect(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed));
 	}
 }
 

bt/tasks/blackboard/bt_set_var.cpp

@@ -48,8 +48,9 @@ void BTSetVar::set_variable(const StringName &p_variable) {
 void BTSetVar::set_value(const Ref<BBVariant> &p_value) {
 	value = p_value;
 	emit_changed();
-	if (Engine::get_singleton()->is_editor_hint() && value.is_valid()) {
-		value->connect(LW_NAME(changed), Callable(this, LW_NAME(emit_changed)));
+	if (Engine::get_singleton()->is_editor_hint() && value.is_valid() &&
+			!value->is_connected(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed))) {
+		value->connect(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed));
 	}
 }
 

bt/tasks/scene/bt_await_animation.cpp

@@ -16,8 +16,9 @@
 void BTAwaitAnimation::set_animation_player(Ref<BBNode> p_animation_player) {
 	animation_player_param = p_animation_player;
 	emit_changed();
-	if (Engine::get_singleton()->is_editor_hint() && animation_player_param.is_valid()) {
-		animation_player_param->connect(LW_NAME(changed), Callable(this, LW_NAME(emit_changed)));
+	if (Engine::get_singleton()->is_editor_hint() && animation_player_param.is_valid() &&
+			!animation_player_param->is_connected(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed))) {
+		animation_player_param->connect(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed));
 	}
 }
 

bt/tasks/scene/bt_check_agent_property.cpp

@@ -24,8 +24,9 @@ void BTCheckAgentProperty::set_check_type(LimboUtility::CheckType p_check_type)
 void BTCheckAgentProperty::set_value(Ref<BBVariant> p_value) {
 	value = p_value;
 	emit_changed();
-	if (Engine::get_singleton()->is_editor_hint() && value.is_valid()) {
-		value->connect(LW_NAME(changed), Callable(this, LW_NAME(emit_changed)));
+	if (Engine::get_singleton()->is_editor_hint() && value.is_valid() &&
+			!value->is_connected(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed))) {
+		value->connect(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed));
 	}
 }
 

bt/tasks/scene/bt_pause_animation.cpp

@@ -16,8 +16,9 @@
 void BTPauseAnimation::set_animation_player(Ref<BBNode> p_animation_player) {
 	animation_player_param = p_animation_player;
 	emit_changed();
-	if (Engine::get_singleton()->is_editor_hint() && animation_player_param.is_valid()) {
-		animation_player_param->connect(LW_NAME(changed), Callable(this, LW_NAME(emit_changed)));
+	if (Engine::get_singleton()->is_editor_hint() && animation_player_param.is_valid() &&
+			!animation_player_param->is_connected(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed))) {
+		animation_player_param->connect(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed));
 	}
 }
 

bt/tasks/scene/bt_play_animation.cpp

@@ -16,8 +16,9 @@
 void BTPlayAnimation::set_animation_player(Ref<BBNode> p_animation_player) {
 	animation_player_param = p_animation_player;
 	emit_changed();
-	if (Engine::get_singleton()->is_editor_hint() && animation_player_param.is_valid()) {
-		animation_player_param->connect(LW_NAME(changed), Callable(this, LW_NAME(emit_changed)));
+	if (Engine::get_singleton()->is_editor_hint() && animation_player_param.is_valid() &&
+			!animation_player_param->is_connected(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed))) {
+		animation_player_param->connect(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed));
 	}
 }
 

bt/tasks/scene/bt_set_agent_property.cpp

@@ -19,8 +19,9 @@ void BTSetAgentProperty::set_property(StringName p_prop) {
 void BTSetAgentProperty::set_value(Ref<BBVariant> p_value) {
 	value = p_value;
 	emit_changed();
-	if (Engine::get_singleton()->is_editor_hint() && value.is_valid()) {
-		value->connect(LW_NAME(changed), Callable(this, LW_NAME(emit_changed)));
+	if (Engine::get_singleton()->is_editor_hint() && value.is_valid() &&
+			!value->is_connected(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed))) {
+		value->connect(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed));
 	}
 }
 

bt/tasks/scene/bt_stop_animation.cpp

@@ -16,8 +16,9 @@
 void BTStopAnimation::set_animation_player(Ref<BBNode> p_animation_player) {
 	animation_player_param = p_animation_player;
 	emit_changed();
-	if (Engine::get_singleton()->is_editor_hint() && animation_player_param.is_valid()) {
-		animation_player_param->connect(LW_NAME(changed), Callable(this, LW_NAME(emit_changed)));
+	if (Engine::get_singleton()->is_editor_hint() && animation_player_param.is_valid() &&
+			!animation_player_param->is_connected(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed))) {
+		animation_player_param->connect(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed));
 	}
 }
 

bt/tasks/utility/bt_call_method.cpp

@@ -28,8 +28,9 @@ void BTCallMethod::set_method(const StringName &p_method_name) {
 void BTCallMethod::set_node_param(const Ref<BBNode> &p_object) {
 	node_param = p_object;
 	emit_changed();
-	if (Engine::get_singleton()->is_editor_hint() && node_param.is_valid()) {
-		node_param->connect(LW_NAME(changed), Callable(this, LW_NAME(emit_changed)));
+	if (Engine::get_singleton()->is_editor_hint() && node_param.is_valid() &&
+			!node_param->is_connected(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed))) {
+		node_param->connect(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed));
 	}
 }
 

bt/tasks/utility/bt_evaluate_expression.cpp

@@ -29,8 +29,9 @@ void BTEvaluateExpression::set_expression_string(const String &p_expression_stri
 void BTEvaluateExpression::set_node_param(Ref<BBNode> p_object) {
 	node_param = p_object;
 	emit_changed();
-	if (Engine::get_singleton()->is_editor_hint() && node_param.is_valid()) {
-		node_param->connect(LW_NAME(changed), Callable(this, LW_NAME(emit_changed)));
+	if (Engine::get_singleton()->is_editor_hint() && node_param.is_valid() &&
+			!node_param->is_connected(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed))) {
+		node_param->connect(LW_NAME(changed), callable_mp((Resource *)this, &Resource::emit_changed));
 	}
 }