From b64a309f78b684bf3acb49bc6d0e9b93aa2138c5 Mon Sep 17 00:00:00 2001
From: Lorn Potter <lorn.potter@nokia.com>
Date: Tue, 20 Apr 2010 07:38:20 +1000
Subject: make sure to lock these

---
 src/plugins/bearer/corewlan/qcorewlanengine.mm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
index f54bd4d..f78fc76 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
@@ -286,6 +286,8 @@ QList<QNetworkConfigurationPrivate *> QScanThread::getConfigurations()
 
 void QScanThread::getUserConfigurations()
 {
+    QMutexLocker locker(&mutex);
+
     QMacCocoaAutoReleasePool pool;
     userProfiles.clear();
 
@@ -354,6 +356,8 @@ void QScanThread::getUserConfigurations()
 
 QString QScanThread::getSsidFromNetworkName(const QString &name)
 {
+    QMutexLocker locker(&mutex);
+
     QMapIterator<QString, QMap<QString,QString> > i(userProfiles);
     while (i.hasNext()) {
         i.next();
@@ -372,6 +376,8 @@ QString QScanThread::getSsidFromNetworkName(const QString &name)
 
 QString QScanThread::getNetworkNameFromSsid(const QString &ssid)
 {
+    QMutexLocker locker(&mutex);
+
     QMapIterator<QString, QMap<QString,QString> > i(userProfiles);
     while (i.hasNext()) {
         i.next();
-- 
cgit v0.12