diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-28 12:31:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-28 12:31:56 (GMT) |
| commit | 25a789c836fd856c0bcda4aeaa51c6e5a99924f5 (patch) | |
| tree | 342026646bd063ef3939e38a6ea453b4e463f68e | |
| parent | 6da180b5cd20afbc5f376a9055756839e6f25861 (diff) | |
| parent | 54d6cc95b41568623824435d4f7aff1c5d535adf (diff) | |
| download | Qt-25a789c836fd856c0bcda4aeaa51c6e5a99924f5.zip Qt-25a789c836fd856c0bcda4aeaa51c6e5a99924f5.tar.gz Qt-25a789c836fd856c0bcda4aeaa51c6e5a99924f5.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Handle exceptions notified by select before read/write.
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_symbian.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp index 0f85a9e..d00a623 100644 --- a/src/corelib/kernel/qeventdispatcher_symbian.cpp +++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp @@ -484,9 +484,9 @@ void QSelectThread::run() } // end for // traversed all, so update + updateActivatedNotifiers(QSocketNotifier::Exception, &exceptionfds); updateActivatedNotifiers(QSocketNotifier::Read, &readfds); updateActivatedNotifiers(QSocketNotifier::Write, &writefds); - updateActivatedNotifiers(QSocketNotifier::Exception, &exceptionfds); break; case EINTR: // Should never occur on Symbian, but this is future proof! @@ -496,9 +496,9 @@ void QSelectThread::run() break; } } else { + updateActivatedNotifiers(QSocketNotifier::Exception, &exceptionfds); updateActivatedNotifiers(QSocketNotifier::Read, &readfds); updateActivatedNotifiers(QSocketNotifier::Write, &writefds); - updateActivatedNotifiers(QSocketNotifier::Exception, &exceptionfds); } m_waitCond.wait(&m_mutex); |