summaryrefslogtreecommitdiffstats
path: root/src/kernel/qeventloop_x11_glib.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-05-14 19:35:54 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-05-14 19:35:54 -0500
commit9a4765a62e321af08ec96a03cdbef64039788e86 (patch)
treefd261fdcf042d490030a2a1d337cf1b7cc8b514f /src/kernel/qeventloop_x11_glib.cpp
parentc740211ffba3330d951f4c3ddefea8edf23a01cd (diff)
downloadtqt3-9a4765a62e321af08ec96a03cdbef64039788e86.tar.gz
tqt3-9a4765a62e321af08ec96a03cdbef64039788e86.zip
Automated update from Qt3
Diffstat (limited to 'src/kernel/qeventloop_x11_glib.cpp')
-rw-r--r--src/kernel/qeventloop_x11_glib.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/kernel/qeventloop_x11_glib.cpp b/src/kernel/qeventloop_x11_glib.cpp
index f19f02f1e..df607ce78 100644
--- a/src/kernel/qeventloop_x11_glib.cpp
+++ b/src/kernel/qeventloop_x11_glib.cpp
@@ -629,6 +629,10 @@ bool TQEventLoop::gsourceDispatch(GSource *gs) {
bool TQEventLoop::hasPendingEvents() const
{
+#ifdef QT_THREAD_SUPPORT
+ TQMutexLocker locker( TQApplication::tqt_mutex );
+#endif // QT_THREAD_SUPPORT
+
extern uint qGlobalPostedEventsCount(); // from qapplication.cpp
return ( qGlobalPostedEventsCount() || ( (tqt_is_gui_used && TQApplication::isGuiThread()) ? XPending( TQPaintDevice::x11AppDisplay() ) : 0));
}