From bbf5f3812d5d093add1d32300ce604794c3a7c2c Mon Sep 17 00:00:00 2001 From: Martin Ridgers Date: Tue, 25 Jan 2022 14:26:47 +0100 Subject: Fixed unexpected abort() call when joining an unjoinable thread --- zenstore/gc.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'zenstore/gc.cpp') diff --git a/zenstore/gc.cpp b/zenstore/gc.cpp index 0e93f1c3d..7be93b4af 100644 --- a/zenstore/gc.cpp +++ b/zenstore/gc.cpp @@ -404,7 +404,10 @@ GcScheduler::Shutdown() m_Status = static_cast(GcSchedulerStatus::kStopped); m_GcSignal.notify_one(); - m_GcThread.join(); + if (m_GcThread.joinable()) + { + m_GcThread.join(); + } } } -- cgit v1.2.3