From f6e67190de05f0cb95545a22670e54ec1a1d6fe9 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 28 Apr 2009 15:00:07 +0300 Subject: Fixed ASSERT panic in Symbian event dispatcher. Moved ASSERT in QSelectThread::requestSocketEvents after mutex lock, since select thread might still have the lock and that's why the notifier might be in m_AOStatuses hash. After main thread has the mutex lock, notifier should not be anymroe in hash. --- src/corelib/kernel/qeventdispatcher_symbian.cpp | 4 ++-- 1 file 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); -- cgit v0.12