From fe1b726b62e9e4e3907c6e30a25093d405b74d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beat=20K=C3=BCng?= Date: Thu, 9 Dec 2021 16:17:25 +0100 Subject: [PATCH] ScheduledWorkItem: do not call ScheduleClear() if not init in destructor This avoids that unit tests trying to access a wq hang. It still fails with an error currently. --- platforms/common/px4_work_queue/ScheduledWorkItem.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platforms/common/px4_work_queue/ScheduledWorkItem.cpp b/platforms/common/px4_work_queue/ScheduledWorkItem.cpp index 4f31825cac..f5f9e130f0 100644 --- a/platforms/common/px4_work_queue/ScheduledWorkItem.cpp +++ b/platforms/common/px4_work_queue/ScheduledWorkItem.cpp @@ -38,7 +38,9 @@ namespace px4 ScheduledWorkItem::~ScheduledWorkItem() { - ScheduleClear(); + if (_call.arg != nullptr) { + ScheduleClear(); + } } void ScheduledWorkItem::schedule_trampoline(void *arg)