diff options
| author | Dyami Caliri <dyami@dragonframe.com> | 2014-10-24 12:57:09 -0700 |
|---|---|---|
| committer | Dyami Caliri <dyami@dragonframe.com> | 2015-02-03 03:35:11 +0000 |
| commit | 10c62c894c25aa1224bc3441fd564430cf7c8103 (patch) | |
| tree | 984556eed713e136e697dea855c13a22db85d413 /src/plugins | |
| parent | c96b5d2b062e2757772a81927936e2a81be41c8e (diff) | |
CoreWLan: properly wait for scan thread to finish
Terminating the scan thread is leading to crashes. So was the previous
solution to use wait(5000), since the scan thread may take longer than
that.
Task-number: QTBUG-36000
Change-Id: I5c37ba5ba3f5c156fca30f3dacaa998c15f76be8
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/bearer/corewlan/qcorewlanengine.mm | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm index 55847a04a4..2b38409723 100644 --- a/src/plugins/bearer/corewlan/qcorewlanengine.mm +++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm @@ -430,7 +430,6 @@ QCoreWlanEngine::QCoreWlanEngine(QObject *parent) QCoreWlanEngine::~QCoreWlanEngine() { - scanThread->terminate(); scanThread->wait(); while (!foundConfigurations.isEmpty()) |