diff options
author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-26 22:00:12 (GMT) |
---|---|---|
committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-26 22:00:12 (GMT) |
commit | 014797f54e24172d424f88e8e2e53f16759d6bb5 (patch) | |
tree | cd77be088d8361fa85429ff4cffd2f75e0f11dff /src | |
parent | 81d25b1c69dc186eaa3d3993e74ae132cc8f582a (diff) | |
parent | 25f856c5719ea903db7d636a54b2145875c1f1ed (diff) | |
download | Qt-014797f54e24172d424f88e8e2e53f16759d6bb5.zip Qt-014797f54e24172d424f88e8e2e53f16759d6bb5.tar.gz Qt-014797f54e24172d424f88e8e2e53f16759d6bb5.tar.bz2 |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src')
-rw-r--r-- | src/network/kernel/qhostinfo.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index 348b0d2..41a9512 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -468,14 +468,17 @@ void QHostInfoRunnable::run() resultEmitter.emitResultsReady(hostInfo); // now also iterate through the postponed ones - QMutableListIterator<QHostInfoRunnable*> iterator(manager->postponedLookups); - while (iterator.hasNext()) { - QHostInfoRunnable* postponed = iterator.next(); - if (toBeLookedUp == postponed->toBeLookedUp) { - // we can now emit - iterator.remove(); - hostInfo.setLookupId(postponed->id); - postponed->resultEmitter.emitResultsReady(hostInfo); + { + QMutexLocker locker(&manager->mutex); + QMutableListIterator<QHostInfoRunnable*> iterator(manager->postponedLookups); + while (iterator.hasNext()) { + QHostInfoRunnable* postponed = iterator.next(); + if (toBeLookedUp == postponed->toBeLookedUp) { + // we can now emit + iterator.remove(); + hostInfo.setLookupId(postponed->id); + postponed->resultEmitter.emitResultsReady(hostInfo); + } } } |