summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksandar Sasha Babic <aleksandar.babic@nokia.com>2009-04-28 12:04:18 (GMT)
committerAleksandar Sasha Babic <aleksandar.babic@nokia.com>2009-04-28 12:04:18 (GMT)
commit776e3379952e039ba1a6649e1bc0bcf8b45a1576 (patch)
treea6adfaf22ce41570164479d39e6eeb55c4cea1ed
parent251e63bfcd5db5947ad3b6699cae6fd3d67d873c (diff)
parent2601f94910694f50c774e5c08438ce841677557b (diff)
downloadQt-776e3379952e039ba1a6649e1bc0bcf8b45a1576.zip
Qt-776e3379952e039ba1a6649e1bc0bcf8b45a1576.tar.gz
Qt-776e3379952e039ba1a6649e1bc0bcf8b45a1576.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
-rw-r--r--src/corelib/kernel/qeventdispatcher_symbian.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp
index b38a6c6..f7605c8 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian.cpp
+++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp
@@ -365,9 +365,9 @@ void QSelectThread::requestSocketEvents ( QSocketNotifier *notifier, TRequestSta
start();
}
- Q_ASSERT(!m_AOStatuses.contains(notifier));
-
QSelectMutexGrabber lock(m_pipeEnds[1], &m_mutex);
+
+ Q_ASSERT(!m_AOStatuses.contains(notifier));
m_AOStatuses.insert(notifier, status);