summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2010-05-28 10:40:44 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2010-05-28 10:40:44 (GMT)
commit54d6cc95b41568623824435d4f7aff1c5d535adf (patch)
tree39e7edc97fddb579449f9e66524b9379dfff4a89
parente8eb56b742cacd896658b64bec5eec0483b69716 (diff)
downloadQt-54d6cc95b41568623824435d4f7aff1c5d535adf.zip
Qt-54d6cc95b41568623824435d4f7aff1c5d535adf.tar.gz
Qt-54d6cc95b41568623824435d4f7aff1c5d535adf.tar.bz2
Handle exceptions notified by select before read/write.
Task-number: MOBILITY-800 Reviewed-by: Aleksandar Sasha Babic
-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 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);