summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer/corewlan/qcorewlanengine_10_6.mm
diff options
context:
space:
mode:
authorDyami Caliri <dyami@dragonframe.com>2014-08-22 08:35:29 -0700
committerDyami Caliri <dyami@dragonframe.com>2014-08-27 17:14:25 +0200
commit1d7408cc8b1a62966ab311e2fb2e6007b1a357fc (patch)
treeaea0eec75ae798139b144e1305435fb3ef930d45 /src/plugins/bearer/corewlan/qcorewlanengine_10_6.mm
parent4dc751360a605f010fd5031e95302bed3317d5e6 (diff)
CoreWLan: terminate scan thread in QCoreWlanEngine destructor
The scan thread can take an indeterminate amount of time, often longer than the 5 seconds we had previously waited. Since this destructor is only called when the application quits, it's ok that some resources may be lost. Task-number: QTBUG-36000 Change-Id: Ib184156b5a23c39ea4f7937a26ecb099554bd4de Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
Diffstat (limited to 'src/plugins/bearer/corewlan/qcorewlanengine_10_6.mm')
-rw-r--r--src/plugins/bearer/corewlan/qcorewlanengine_10_6.mm3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine_10_6.mm b/src/plugins/bearer/corewlan/qcorewlanengine_10_6.mm
index ba1cf33258..6cf614cb30 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine_10_6.mm
+++ b/src/plugins/bearer/corewlan/qcorewlanengine_10_6.mm
@@ -404,7 +404,8 @@ QCoreWlanEngine::QCoreWlanEngine(QObject *parent)
QCoreWlanEngine::~QCoreWlanEngine()
{
- scanThread->wait(5000);
+ scanThread->terminate();
+ scanThread->wait();
while (!foundConfigurations.isEmpty())
delete foundConfigurations.takeFirst();