Fix issue #2566: Prevent follow actor plugin from crashing when actor…

… is (#2577) removed Adds a simple check that the entities are still in the scene. Signed-off-by: Arjo Chakravarty <[email protected]>
gazebosim · Sep 3, 2024 · faebf12 · faebf12
1 parent 7b3d182
commit faebf12
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/systems/follow_actor/FollowActor.cc b/src/systems/follow_actor/FollowActor.cc
@@ -209,7 +209,9 @@ void FollowActor::PreUpdate(const UpdateInfo &_info,
   this->dataPtr->lastUpdate = _info.simTime;
 
   // Is there a follow target?
-  if (this->dataPtr->targetEntity == kNullEntity)
+  if (this->dataPtr->targetEntity == kNullEntity ||
+    _ecm.HasEntity(this->dataPtr->targetEntity) ||
+    _ecm.HasEntity(this->dataPtr->actorEntity))
     return;
 
   // Current world pose