summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-04-28 12:00:07 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-04-28 12:00:07 (GMT)
commitf6e67190de05f0cb95545a22670e54ec1a1d6fe9 (patch)
treed432be11fe3d78318f50d85277d61b556a47c073 /src/corelib
parent08dc54fe49288486b989bd8f823ecdbf3454d47e (diff)
downloadQt-f6e67190de05f0cb95545a22670e54ec1a1d6fe9.zip
Qt-f6e67190de05f0cb95545a22670e54ec1a1d6fe9.tar.gz
Qt-f6e67190de05f0cb95545a22670e54ec1a1d6fe9.tar.bz2
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.
Diffstat (limited to 'src/corelib')
-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);