Prevent possible deadlock on exit

11 years ago · 9b9b6bae99
1 changed files with 5 additions and 4 deletions
--- a/src/core.cpp
+++ b/src/core.cpp
@ -99,10 +99,11 @@ Core::~Core()
    toxTimer->stop();
    coreThread->exit(0);
-    qApp->processEvents();
+    while (coreThread->isRunning())
-    coreThread->wait();
+    {
-    if (coreThread->isRunning())
+        qApp->processEvents();
-        coreThread->terminate();
+        coreThread->wait(500);
    }
    if (tox)
    {