summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMai M <mathew1800@gmail.com>2021-06-22 22:20:14 -0400
committerGitHub <noreply@github.com>2021-06-22 22:20:14 -0400
commitd6b51e5e2182eeda581135f4c282469885a9e984 (patch)
tree7bee9af13999732a0a9c1194707d39b6bc493156
parent95b4c78b07434f0b668b1168bf859434cae37a6c (diff)
parent1ca9a13e507ae5ba7c23b510b2dae0ab26d501fd (diff)
Merge pull request #6512 from ReinUsesLisp/wait-detached-stasks
common/detached_tasks: Wait for tasks before shutting down
-rw-r--r--src/common/detached_tasks.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/common/detached_tasks.cpp b/src/common/detached_tasks.cpp
index f2b4939df..c1362631e 100644
--- a/src/common/detached_tasks.cpp
+++ b/src/common/detached_tasks.cpp
@@ -21,6 +21,8 @@ void DetachedTasks::WaitForAllTasks() {
}
DetachedTasks::~DetachedTasks() {
+ WaitForAllTasks();
+
std::unique_lock lock{mutex};
ASSERT(count == 0);
instance = nullptr;