aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ridgers <[email protected]>2022-01-25 14:26:47 +0100
committerMartin Ridgers <[email protected]>2022-01-25 14:26:47 +0100
commitbbf5f3812d5d093add1d32300ce604794c3a7c2c (patch)
tree84574cc180cd5355388e4ba30a2aade476742a17
parentMac compile fix (diff)
downloadzen-bbf5f3812d5d093add1d32300ce604794c3a7c2c.tar.xz
zen-bbf5f3812d5d093add1d32300ce604794c3a7c2c.zip
Fixed unexpected abort() call when joining an unjoinable thread
-rw-r--r--zenstore/gc.cpp5
1 files changed, 4 insertions, 1 deletions
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<uint32_t>(GcSchedulerStatus::kStopped);
m_GcSignal.notify_one();
- m_GcThread.join();
+ if (m_GcThread.joinable())
+ {
+ m_GcThread.join();
+ }
}
}