diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-08-16 01:16:41 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-08-16 05:09:59 (GMT) |
| commit | 6f911718ba51b84ea34b45baf7f8b16954c33371 (patch) | |
| tree | b3c103ab1ffcb6672a7ff5091d94c63a8f193ad6 /src | |
| parent | dbdbac99ef4ae5243a5f2571b66d4949dbfdc88c (diff) | |
| download | Qt-6f911718ba51b84ea34b45baf7f8b16954c33371.zip Qt-6f911718ba51b84ea34b45baf7f8b16954c33371.tar.gz Qt-6f911718ba51b84ea34b45baf7f8b16954c33371.tar.bz2 | |
Mutex is already locked when private member function is called.
Conflicts:
src/plugins/bearer/icd/qicdengine.cpp
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/bearer/icd/qicdengine.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/bearer/icd/qicdengine.cpp b/src/plugins/bearer/icd/qicdengine.cpp index cae2b7c..3264f15 100644 --- a/src/plugins/bearer/icd/qicdengine.cpp +++ b/src/plugins/bearer/icd/qicdengine.cpp @@ -807,7 +807,6 @@ void QIcdEngine::getIcdInitialState() */ Maemo::Icd icd; QList<Maemo::IcdStateResult> state_results; - QMutexLocker locker(&mutex); QNetworkConfigurationPrivatePointer ptr; if (icd.state(state_results) && !state_results.isEmpty()) { @@ -825,9 +824,9 @@ void QIcdEngine::getIcdInitialState() ptr->state = QNetworkConfiguration::Active; configLocker.unlock(); - locker.unlock(); + mutex.unlock(); emit configurationChanged(ptr); - locker.relock(); + mutex.lock(); } break; default: |