summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-05-17 02:17:30 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-05-17 02:17:30 -0500
commit8ff73908ee9670f5ce72613b65bf1b21b9544b96 (patch)
tree1e5fc67f56df1ea625e38eb1ec0ed54a59023593 /src
parent17ffc1e193fc3a089ef19ec79fa2a5bbb071ce82 (diff)
downloadqt3-8ff73908ee9670f5ce72613b65bf1b21b9544b96.tar.gz
qt3-8ff73908ee9670f5ce72613b65bf1b21b9544b96.zip
Fix crash on thread termination
Diffstat (limited to 'src')
-rw-r--r--src/kernel/qapplication.cpp2
1 files changed, 1 insertions, 1 deletions
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);