fix: use deleteLater for network objects and order them (#5297)

This commit is contained in:
nerix
2024-04-03 21:08:52 +02:00
committed by GitHub
parent 8db0bb464d
commit 2ea24c1a9d
2 changed files with 8 additions and 4 deletions
+7 -3
View File
@@ -24,15 +24,19 @@ void NetworkManager::deinit()
assert(NetworkManager::workerThread);
assert(NetworkManager::accessManager);
// delete the access manager first:
// - put the event on the worker thread
// - wait for it to process
NetworkManager::accessManager->deleteLater();
NetworkManager::accessManager = nullptr;
if (NetworkManager::workerThread)
{
NetworkManager::workerThread->quit();
NetworkManager::workerThread->wait();
}
delete NetworkManager::accessManager;
NetworkManager::accessManager = nullptr;
delete NetworkManager::workerThread;
NetworkManager::workerThread->deleteLater();
NetworkManager::workerThread = nullptr;
}