diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-02-27 23:02:00 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-02-27 23:14:44 +0200 |
| commit | 18ec799992e0e2571ed3d3a61454be682a81aa16 (patch) | |
| tree | 72418ed46d84a49b4f4aec7c25e0ac604f80d811 | |
| parent | 44ea9490797ce0e984aadbf438c7a2aceef5ddf0 (diff) | |
SL-18721 Shutdown fixes #5
| -rw-r--r-- | indra/llcommon/threadpool.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llcommon/threadpool.cpp b/indra/llcommon/threadpool.cpp index a063a01b82..c48989358e 100644 --- a/indra/llcommon/threadpool.cpp +++ b/indra/llcommon/threadpool.cpp @@ -120,8 +120,11 @@ void LL::ThreadPoolBase::close() mQueue->close(); for (auto& pair: mThreads) { - LL_DEBUGS("ThreadPool") << mName << " waiting on thread " << pair.first << LL_ENDL; - pair.second.join(); + if (pair.second.joinable()) + { + LL_DEBUGS("ThreadPool") << mName << " waiting on thread " << pair.first << LL_ENDL; + pair.second.join(); + } } LL_DEBUGS("ThreadPool") << mName << " shutdown complete" << LL_ENDL; } |