1 files changed, 10 insertions, 12 deletions

diff --git a/src/qml/qml/ftw/qqmlthread.cpp b/src/qml/qml/ftw/qqmlthread.cpp
index 7d2ad354d6..0f7726ef65 100644
--- a/src/qml/qml/ftw/qqmlthread.cpp
+++ b/src/qml/qml/ftw/qqmlthread.cpp
@@ -188,13 +188,7 @@ void QQmlThreadPrivate::threadEvent()
     lock();
 
     for (;;) {
-        if (m_shutdown) {
-            quit();
-            wakeOne();
-            unlock();
-
-            return;
-        } else if (!threadList.isEmpty()) {
+        if (!threadList.isEmpty()) {
             m_threadProcessing = true;
 
             QQmlThread::Message *message = threadList.first();
@@ -206,6 +200,12 @@ void QQmlThreadPrivate::threadEvent()
             lock();
 
             delete threadList.takeFirst();
+        } else if (m_shutdown) {
+            quit();
+            wakeOne();
+            unlock();
+
+            return;
         } else {
             wakeOne();
 
@@ -242,6 +242,7 @@ void QQmlThread::shutdown()
     d->lock();
     Q_ASSERT(!d->m_shutdown);
 
+    d->m_shutdown = true;
     for (;;) {
         if (d->mainSync || !d->mainList.isEmpty()) {
             d->unlock();
@@ -254,13 +255,10 @@ void QQmlThread::shutdown()
         }
     }
 
-    d->m_shutdown = true;
-    if (QCoreApplication::closingDown()) {
+    if (QCoreApplication::closingDown())
         d->quit();
-    } else {
+    else
         d->triggerThreadEvent();
-        d->wait();
-    }
 
     d->unlock();
     d->QThread::wait();