From 3cd9a56f1b94342c4abbb5375fcb84cd9ed5c4fb Mon Sep 17 00:00:00 2001
From: Julian Oes <julian@oes.ch>
Date: Wed, 18 Feb 2026 20:26:20 +1300
Subject: [PATCH] simulation: fix TSAN issue

---
 src/modules/simulation/simulator_mavlink/SimulatorMavlink.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/simulation/simulator_mavlink/SimulatorMavlink.cpp b/src/modules/simulation/simulator_mavlink/SimulatorMavlink.cpp
index 342cfcd4e7..43f0662f11 100644
--- a/src/modules/simulation/simulator_mavlink/SimulatorMavlink.cpp
+++ b/src/modules/simulation/simulator_mavlink/SimulatorMavlink.cpp
@@ -1687,6 +1687,7 @@ int simulator_mavlink_main(int argc, char *argv[])
 
 		} else {
 			px4_task_delete(g_sim_task);
+			px4_task_join(g_sim_task);
 			g_sim_task = -1;
 		}