summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-05-17 02:18:01 -0500
committerTimothy Pearson <[email protected]>2013-05-17 02:18:01 -0500
commit245c821c1974c8a9bce0f2977ab5f462c87a9cba (patch)
tree58f95d360c4501d8edb7ce5b31213814d781128f
parentdab41fe3e687e8b677e91c922c7f63afbe3e747a (diff)
downloadtqt3-245c821c1974c8a9bce0f2977ab5f462c87a9cba.tar.gz
tqt3-245c821c1974c8a9bce0f2977ab5f462c87a9cba.zip
Automated update from Qt3
-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 10e25adb6..83d8b6c58 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -3732,7 +3732,7 @@ void TQApplication::removePostedEvent( TQEvent * event )
void tqThreadTerminationHandlerRecursive( TQObject* object, TQThread* originThread, TQThread* destinationThread ) {
#ifdef QT_THREAD_SUPPORT
TQThread* objectThread = object->contextThreadObject();
- if (objectThread != destinationThread) {
+ if (objectThread && (objectThread != destinationThread)) {
TQThread::CleanupType cleanupType = objectThread->cleanupType();
if (cleanupType == TQThread::CleanupMergeObjects) {
object->moveToThread(destinationThread);