diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-08 15:56:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-08 15:56:45 (GMT) |
| commit | b8f70279399a6bce8305772cdbd0a2e260e23ef8 (patch) | |
| tree | 8251072be895f4b36693547fe05abc1e4ca31326 | |
| parent | 72927a228560efe55c99b7bb51c7458205cf1797 (diff) | |
| parent | 8ed37d9bba6e2899724d13bd3ba8911c505b1c8c (diff) | |
| download | Qt-b8f70279399a6bce8305772cdbd0a2e260e23ef8.zip Qt-b8f70279399a6bce8305772cdbd0a2e260e23ef8.tar.gz Qt-b8f70279399a6bce8305772cdbd0a2e260e23ef8.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team:
Symbian: improving diagnostics for QWaitCondition
| -rw-r--r-- | src/corelib/thread/qwaitcondition_symbian.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/thread/qwaitcondition_symbian.cpp b/src/corelib/thread/qwaitcondition_symbian.cpp index c6414e8..ed1011c 100644 --- a/src/corelib/thread/qwaitcondition_symbian.cpp +++ b/src/corelib/thread/qwaitcondition_symbian.cpp @@ -112,7 +112,10 @@ public: --wakeups; } - mutex.Signal(); + // if err is KErrGeneral it signals that the RCondVar is closed along with the mutex and that this has been deleted + // we must not access any member variables in this case + if (err != KErrGeneral) + mutex.Signal(); if (err && err != KErrTimedOut) report_error(err, "QWaitCondition::wait()", "cv wait"); |