summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorTomi Vihria <tomi.vihria@nokia.com>2011-09-15 13:53:35 (GMT)
committerTomi Vihria <tomi.vihria@nokia.com>2011-09-15 13:53:35 (GMT)
commit3b93ff8f65f55209a5dd8634efc8c92cba2970f8 (patch)
tree30778f73aca1a1a921add7cec084be6920ab520b /src/corelib
parent68cc31ad700abc4dc480c39e98feea4fe904db71 (diff)
downloadQt-3b93ff8f65f55209a5dd8634efc8c92cba2970f8.zip
Qt-3b93ff8f65f55209a5dd8634efc8c92cba2970f8.tar.gz
Qt-3b93ff8f65f55209a5dd8634efc8c92cba2970f8.tar.bz2
Fix missing clean up stack panic for a new thread in Symbian
The clean up stack for a new thread was created in a too late phase for a process that doesn't have symbianVersion string in its cache Task-number: QT-5269 Reviewed-by: Murray Read
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/thread/qthread_symbian.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/thread/qthread_symbian.cpp b/src/corelib/thread/qthread_symbian.cpp
index 46339a6..2ea1b44 100644
--- a/src/corelib/thread/qthread_symbian.cpp
+++ b/src/corelib/thread/qthread_symbian.cpp
@@ -324,13 +324,14 @@ void *QThreadPrivate::start(void *arg)
data->threadId = QThread::currentThreadId();
set_thread_data(data);
+ CTrapCleanup *cleanup = CTrapCleanup::New();
+ q_check_ptr(cleanup);
+
{
QMutexLocker locker(&thr->d_func()->mutex);
data->quitNow = thr->d_func()->exited;
}
- CTrapCleanup *cleanup = CTrapCleanup::New();
-
// ### TODO: allow the user to create a custom event dispatcher
createEventDispatcher(data);