diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-11-03 01:01:37 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-11-03 01:01:37 -0500 |
| commit | 8d210f61fc399ab91c0dee097a47185cf9e008fd (patch) | |
| tree | 69b010cd5fd21e90e5b88540afd0fc27e9a3967d /src/kernel/qeventloop_unix_glib.cpp | |
| parent | d83cf650024b54665dbb8afe19b185e1fe74e3bd (diff) | |
| download | tqt-8d210f61fc399ab91c0dee097a47185cf9e008fd.tar.gz tqt-8d210f61fc399ab91c0dee097a47185cf9e008fd.zip | |
Automated update from Qt3
Diffstat (limited to 'src/kernel/qeventloop_unix_glib.cpp')
| -rw-r--r-- | src/kernel/qeventloop_unix_glib.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/kernel/qeventloop_unix_glib.cpp b/src/kernel/qeventloop_unix_glib.cpp index 1decd8f1b..795dc9ba8 100644 --- a/src/kernel/qeventloop_unix_glib.cpp +++ b/src/kernel/qeventloop_unix_glib.cpp @@ -688,7 +688,7 @@ int TQEventLoop::activateTimers() TQTimerEvent e( t->id ); #if defined(QT_THREAD_SUPPORT) // Be careful...the current thread may not be the target object's thread! - if ((!t->obj) || (t->obj && (t->obj->contextThreadObject() == TQThread::currentThreadObject()))) { + if ((!t->obj) || (TQThread::currentThreadObject()->threadPostedEventsDisabled()) || (t->obj && (t->obj->contextThreadObject() == TQThread::currentThreadObject()))) { TQApplication::sendEvent( t->obj, &e ); // send event } else { @@ -731,7 +731,7 @@ int TQEventLoop::activateSocketNotifiers() sn->pending = FALSE; #if defined(QT_THREAD_SUPPORT) // Be careful...the current thread may not be the target object's thread! - if ((!sn->obj) || (sn->obj && (sn->obj->contextThreadObject() == TQThread::currentThreadObject()))) { + if ((!sn->obj) || (TQThread::currentThreadObject()->threadPostedEventsDisabled()) || (sn->obj && (sn->obj->contextThreadObject() == TQThread::currentThreadObject()))) { TQApplication::sendEvent( sn->obj, &event ); // send event } else { |