diff options
| author | Christoph Keller <gri@not-censored.com> | 2014-09-24 16:19:15 +0200 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2014-09-30 11:10:45 +0200 |
| commit | 4a324f7daf1734181d60c417e4c0b647ced5ad1d (patch) | |
| tree | a267382ad6c1c72b677f5958b0159cfd2e34206a | |
| parent | 4d4a518306dedf9dc26f3ae23edb9e2c56295b9a (diff) | |
Fixed runloopThread being uninitialized and causing a crash in destruction.
Change-Id: I2e695f872d8d43978eba0030d72ee635c36f2103
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| -rw-r--r-- | src/systeminfo/mac/qnetworkinfo_mac.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/systeminfo/mac/qnetworkinfo_mac.mm b/src/systeminfo/mac/qnetworkinfo_mac.mm index cd0bf00b..555db03f 100644 --- a/src/systeminfo/mac/qnetworkinfo_mac.mm +++ b/src/systeminfo/mac/qnetworkinfo_mac.mm @@ -322,6 +322,7 @@ QNetworkInfoPrivate::QNetworkInfoPrivate(QNetworkInfo *parent) [pool release]; #endif rssiTimer = new QTimer(this); + runloopThread = NULL; if (!self) self = this; @@ -333,7 +334,7 @@ QNetworkInfoPrivate::QNetworkInfoPrivate(QNetworkInfo *parent) QNetworkInfoPrivate::~QNetworkInfoPrivate() { #ifndef MAC_SDK_10_5 - if (hasWifi && networkThreadOk && runloopThread->keepRunning) { + if (runloopThread && hasWifi && networkThreadOk && runloopThread->keepRunning) { runloopThread->stop(); delete runloopThread; } |