diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-04 09:00:35 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-07 15:11:06 (GMT) |
| commit | a77ab4c4dd3c0d9c5cf71afc4d3efcc76a068430 (patch) | |
| tree | 47d2955a71c203240a55b892561075c33b39b5c5 /src/corelib/thread | |
| parent | cce5cde471cb107924a31c91a05ca299f1668edb (diff) | |
| download | Qt-a77ab4c4dd3c0d9c5cf71afc4d3efcc76a068430.zip Qt-a77ab4c4dd3c0d9c5cf71afc4d3efcc76a068430.tar.gz Qt-a77ab4c4dd3c0d9c5cf71afc4d3efcc76a068430.tar.bz2 | |
Fix race condition between QEventLoop::exec and QThread::exit
As also mentioned in QTBUG-16692
Reviewed-by: brad
Task-number: QTBUG-17257
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qthread_unix.cpp | 5 | ||||
| -rw-r--r-- | src/corelib/thread/qthread_win.cpp | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp index 891ac77..5e0d2a2 100644 --- a/src/corelib/thread/qthread_unix.cpp +++ b/src/corelib/thread/qthread_unix.cpp @@ -327,7 +327,10 @@ void *QThreadPrivate::start(void *arg) set_thread_data(data); data->ref(); - data->quitNow = false; + { + QMutexLocker locker(&thr->d_func()->mutex); + data->quitNow = thr->d_func()->exited; + } // ### TODO: allow the user to create a custom event dispatcher createEventDispatcher(data); diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp index cb2d1a9..f2d1310 100644 --- a/src/corelib/thread/qthread_win.cpp +++ b/src/corelib/thread/qthread_win.cpp @@ -298,7 +298,10 @@ unsigned int __stdcall QThreadPrivate::start(void *arg) QThread::setTerminationEnabled(false); - data->quitNow = false; + { + QMutexLocker locker(&thr->d_func()->mutex); + data->quitNow = !thr->d_func()->exited; + } // ### TODO: allow the user to create a custom event dispatcher createEventDispatcher(data); |