From 8ff73908ee9670f5ce72613b65bf1b21b9544b96 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 17 May 2013 02:17:30 -0500
Subject: Fix crash on thread termination
---
src/kernel/qapplication.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src/kernel/qapplication.cpp')
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index 63ddd1e..e556e37 100644
--- 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);
--
cgit v1.2.1