avoid lock in QBearerEngine::configurationsInUse()

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/network/bearer/qbearerengine.cpp b/src/network/bearer/qbearerengine.cpp
index 02ba1b7..24ecd0e 100644 (file)
--- a/src/network/bearer/qbearerengine.cpp
+++ b/src/network/bearer/qbearerengine.cpp
@@ -52,6 +52,8 @@ QBearerEngine::QBearerEngine(QObject *parent)
 
 QBearerEngine::~QBearerEngine()
 {
+    QMutexLocker locker(&mutex);
+
     QHash<QString, QNetworkConfigurationPrivatePointer>::Iterator it;
     QHash<QString, QNetworkConfigurationPrivatePointer>::Iterator end;
 
@@ -92,8 +94,6 @@ bool QBearerEngine::configurationsInUse() const
     QHash<QString, QNetworkConfigurationPrivatePointer>::ConstIterator it;
     QHash<QString, QNetworkConfigurationPrivatePointer>::ConstIterator end;
 
-    QMutexLocker locker(&mutex);
-
     for (it = accessPointConfigurations.constBegin(),
          end = accessPointConfigurations.constEnd(); it != end; ++it) {
         if (it.value()->ref > 1)

diff --git a/src/network/bearer/qbearerengine_p.h b/src/network/bearer/qbearerengine_p.h
index f650c9a..3dd8340 100644 (file)
--- a/src/network/bearer/qbearerengine_p.h
+++ b/src/network/bearer/qbearerengine_p.h
@@ -98,7 +98,7 @@ protected:
     QHash<QString, QNetworkConfigurationPrivatePointer> snapConfigurations;
     QHash<QString, QNetworkConfigurationPrivatePointer> userChoiceConfigurations;
 
-    mutable QMutex mutex;
+    QMutex mutex;
 };
 
 QT_END_NAMESPACE