summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPerttu Pohjonen <perttu.pohjonen@nokia.com>2011-03-07 06:49:00 (GMT)
committerTimo Turunen <timo.p.turunen@nokia.com>2011-03-10 22:03:04 (GMT)
commit19d11751da73fded31605bb80f70642faf4095c5 (patch)
treee95cda3784a853dd77425e81b19f6b5569b10512
parent0828c69ad805406568f6eef2bffbbd54b04dea41 (diff)
downloadQt-19d11751da73fded31605bb80f70642faf4095c5.zip
Qt-19d11751da73fded31605bb80f70642faf4095c5.tar.gz
Qt-19d11751da73fded31605bb80f70642faf4095c5.tar.bz2
Unsuccessful unlocking of QNetworkConfigurationPrivate mutex
Above mentioned mutex is locked twice: first in caller function and second time in called function. Called function unlocks mutex and emits signal clearly unaware that the mutex is actually still locked. I changed the mutex to be unlocked before the function is called. Task-number: QTBUG-15108 Reviewed-by: Ville Pernu (cherry picked from commit c15560fbe2a1762117395c5ecaaecfa5ab8dce6f)
-rw-r--r--src/plugins/bearer/symbian/symbianengine.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/bearer/symbian/symbianengine.cpp b/src/plugins/bearer/symbian/symbianengine.cpp
index bcf7dd9..edf4b89 100644
--- a/src/plugins/bearer/symbian/symbianengine.cpp
+++ b/src/plugins/bearer/symbian/symbianengine.cpp
@@ -829,6 +829,7 @@ void SymbianEngine::updateStatesToSnaps()
discovered = true;
}
}
+ snapConfigLocker.unlock();
if (active) {
changeConfigurationStateTo(ptr, QNetworkConfiguration::Active);
} else if (discovered) {