Merge pull request #15970 from Atlante45/fix/es-crash

Make sure the send thread terminates before delete
This commit is contained in:
Shannon Romano 2019-07-24 09:04:21 -07:00 committed by GitHub
commit 9d3d7b4e06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1292,6 +1292,7 @@ void OctreeServer::aboutToFinish() {
for (auto& it : _sendThreads) {
auto& sendThread = *it.second;
sendThread.setIsShuttingDown();
sendThread.terminate();
}
// Clear will destruct all the unique_ptr to OctreeSendThreads which will call the GenericThread's dtor