diff options
| author | axis <qt-info@nokia.com> | 2010-09-01 13:11:19 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-09-01 13:11:19 (GMT) |
| commit | 331522fdcbf14d757b61ed79dcc11649f62f28c8 (patch) | |
| tree | 57653fdd33e55e5093cc88ec8ff67e3fdfafc913 /src/corelib | |
| parent | dd1a7c2186348157c4a255f56f280006c8d8c17d (diff) | |
| parent | 5ca6264933af60b3cd376b7f08bea008fa69b515 (diff) | |
| download | Qt-331522fdcbf14d757b61ed79dcc11649f62f28c8.zip Qt-331522fdcbf14d757b61ed79dcc11649f62f28c8.tar.gz Qt-331522fdcbf14d757b61ed79dcc11649f62f28c8.tar.bz2 | |
Merge branch 'variousFixes' into 4.7-s60
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qeventdispatcher_symbian.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp index 1bad8ed..5cc6ae3 100644 --- a/src/corelib/kernel/qeventdispatcher_symbian.cpp +++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp @@ -232,8 +232,12 @@ void QTimerActiveObject::DoCancel() void QTimerActiveObject::RunL() { - int error; - QT_TRYCATCH_ERROR(error, Run()); + int error = KErrNone; + if (iStatus == KErrNone) { + QT_TRYCATCH_ERROR(error, Run()); + } else { + error = iStatus.Int(); + } // All Symbian error codes are negative. if (error < 0) { CActiveScheduler::Current()->Error(error); // stop and report here, as this timer will be deleted on scope exit |