Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 11:37:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
assignment-client/src/octree/OctreeServer.cpp
View file

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