summaryrefslogtreecommitdiffstats
path: root/src/kernel/qeventloop_x11.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-12-06 18:29:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-12-06 18:29:37 -0600
commitcaf80d88243aaa00e8f1baeaa6b7e4c3aca75f63 (patch)
tree860926c1e01068a8d3b8ea120630a48cf537424b /src/kernel/qeventloop_x11.cpp
parent78125ea2f051107b84fdc0354acdedb7885308ee (diff)
downloadqt3-caf80d88243aaa00e8f1baeaa6b7e4c3aca75f63.tar.gz
qt3-caf80d88243aaa00e8f1baeaa6b7e4c3aca75f63.zip
Add threading tutorial and fix a couple rare crashes
Diffstat (limited to 'src/kernel/qeventloop_x11.cpp')
-rw-r--r--src/kernel/qeventloop_x11.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/kernel/qeventloop_x11.cpp b/src/kernel/qeventloop_x11.cpp
index cd3e865..5ee41ca 100644
--- a/src/kernel/qeventloop_x11.cpp
+++ b/src/kernel/qeventloop_x11.cpp
@@ -284,7 +284,8 @@ bool QEventLoop::processEvents( ProcessEventsFlags flags )
// unlock the GUI mutex and select. when we return from this function, there is
// something for us to do
#if defined(QT_THREAD_SUPPORT)
- locker.mutex()->unlock();
+ if ( locker.mutex() ) locker.mutex()->unlock();
+ else return false;
#endif
int nsel;
@@ -298,7 +299,8 @@ bool QEventLoop::processEvents( ProcessEventsFlags flags )
// relock the GUI mutex before processing any pending events
#if defined(QT_THREAD_SUPPORT)
- locker.mutex()->lock();
+ if ( locker.mutex() ) locker.mutex()->lock();
+ else return false;
#endif
// we are awake, broadcast it