diff options
| author | David Faure <david.faure@kdab.com> | 2013-03-18 15:19:44 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-22 16:44:51 +0100 |
| commit | f4609b202208fe592d24c7ae3b4a48ee83045497 (patch) | |
| tree | c9827efe74688595664c379085ba2a6267e49c13 /src/corelib/kernel/qabstracteventdispatcher.cpp | |
| parent | 85b25fc22176b574865813fa53f7eb2fcbdc89bf (diff) | |
QThread: fix race when setting the eventDispatcher
Use QAtomicPointer to make this thread-safe.
Change-Id: If71f204699fcefabdb59bd26342d777d1cc9e2a7
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/kernel/qabstracteventdispatcher.cpp')
| -rw-r--r-- | src/corelib/kernel/qabstracteventdispatcher.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp index c4e02c0347..6558893036 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.cpp +++ b/src/corelib/kernel/qabstracteventdispatcher.cpp @@ -172,7 +172,7 @@ QAbstractEventDispatcher::~QAbstractEventDispatcher() QAbstractEventDispatcher *QAbstractEventDispatcher::instance(QThread *thread) { QThreadData *data = thread ? QThreadData::get2(thread) : QThreadData::current(); - return data->eventDispatcher; + return data->eventDispatcher.load(); } /*! |