summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-04-28 12:44:50 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-04-28 12:44:50 (GMT)
commit22fcb9580a6e2a183489c35eeafb6b32fcde96ea (patch)
tree4d4bf0ab41d92e96de6b2cbe47e9f81e9c7c8be4 /src
parent133a766d2e893a2f954f6bfbb18319e860e3836f (diff)
parent776e3379952e039ba1a6649e1bc0bcf8b45a1576 (diff)
downloadQt-22fcb9580a6e2a183489c35eeafb6b32fcde96ea.zip
Qt-22fcb9580a6e2a183489c35eeafb6b32fcde96ea.tar.gz
Qt-22fcb9580a6e2a183489c35eeafb6b32fcde96ea.tar.bz2
Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public
Diffstat (limited to 'src')
-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);