1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Prevent possible deadlock on exit

This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2015-01-24 19:48:23 +01:00
parent 6e1484252a
commit 9b9b6bae99
No known key found for this signature in database
GPG Key ID: 7E086DD661263264

View File

@ -99,10 +99,11 @@ Core::~Core()
toxTimer->stop(); toxTimer->stop();
coreThread->exit(0); coreThread->exit(0);
qApp->processEvents(); while (coreThread->isRunning())
coreThread->wait(); {
if (coreThread->isRunning()) qApp->processEvents();
coreThread->terminate(); coreThread->wait(500);
}
if (tox) if (tox)
{ {