Fix crash on thread termination

12 years ago · 8ff73908ee
parent 17ffc1e193
commit 8ff73908ee
1 changed files with 1 additions and 1 deletions
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@ -3732,7 +3732,7 @@ void QApplication::removePostedEvent( QEvent *  event )
 void qThreadTerminationHandlerRecursive( QObject* object, QThread* originThread, QThread* destinationThread ) {
 #ifdef QT_THREAD_SUPPORT
 	QThread* objectThread = object->contextThreadObject();
-	if (objectThread != destinationThread) {
+	if (objectThread && (objectThread != destinationThread)) {
 		QThread::CleanupType cleanupType = objectThread->cleanupType();
 		if (cleanupType == QThread::CleanupMergeObjects) {
 			object->moveToThread(destinationThread);