summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-06-17 10:48:32 (GMT)
committeraxis <qt-info@nokia.com>2009-06-17 10:48:32 (GMT)
commit31f97fae841b31e846e7f8754e84320f5925bff5 (patch)
tree1c87aa1b21e225457a7c95e479a7410a7e8620d0 /src
parent7442925bd3a88a15ac0db0dce9bb5d7a3aa6e622 (diff)
downloadQt-31f97fae841b31e846e7f8754e84320f5925bff5.zip
Qt-31f97fae841b31e846e7f8754e84320f5925bff5.tar.gz
Qt-31f97fae841b31e846e7f8754e84320f5925bff5.tar.bz2
Readded code that was lost during exception integration.
AutoTest: Passed RevBy: Trust me
Diffstat (limited to 'src')
-rw-r--r--src/corelib/kernel/qeventdispatcher_symbian.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp
index 423fbaa..c0b9e02 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian.cpp
+++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp
@@ -231,6 +231,9 @@ void QTimerActiveObject::RunL()
void QTimerActiveObject::Run()
{
+ if (!okToRun())
+ return;
+
if (m_timerInfo->interval > 0) {
// Start a new timer immediately so that we don't lose time.
iStatus = KRequestPending;