diff options
| -rw-r--r-- | src/corelib/thread/qthread_symbian.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/corelib/thread/qthread_symbian.cpp b/src/corelib/thread/qthread_symbian.cpp index 78bb293c75..9f5bbef09c 100644 --- a/src/corelib/thread/qthread_symbian.cpp +++ b/src/corelib/thread/qthread_symbian.cpp @@ -337,18 +337,26 @@ void *QThreadPrivate::start(void *arg) // ### TODO: allow the user to create a custom event dispatcher createEventDispatcher(data); - emit thr->started(); TRAPD(err, { try { + emit thr->started(); thr->run(); } catch (const std::exception& ex) { qWarning("QThreadPrivate::start: Thread exited on exception %s", ex.what()); + User::Leave(KErrGeneral); // leave to force cleanup stack cleanup } }); if (err) qWarning("QThreadPrivate::start: Thread exited on leave %d", err); - QThreadPrivate::finish(arg); + // finish emits signals which should be wrapped in a trap for Symbian code, but otherwise ignore leaves and exceptions. + TRAP(err, { + try { + QThreadPrivate::finish(arg); + } catch (const std::exception& ex) { + User::Leave(KErrGeneral); // leave to force cleanup stack cleanup + } + }); delete cleanup; |