diff options
| author | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-04-14 10:52:21 +0000 |
|---|---|---|
| committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-04-14 10:52:21 +0000 |
| commit | b7a3aa39e7bdfcee05ab4fcd01bf4e7a66d2d73c (patch) | |
| tree | 44f667eb1a648cf059d4cc9c924de17be15d55d4 /src | |
| parent | 38abdd33f1b806f4ec9d10a517447e6a2dde9332 (diff) | |
| parent | ec3e90a9e43221b12bc00a1ceaa7ca26e6be5b59 (diff) | |
Merge integration refs/builds/qtci/dev/1618388786
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/networkinformationbackends/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/plugins/networkinformationbackends/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp b/src/plugins/networkinformationbackends/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp index 207c82efd96..c6b0a6e79bd 100644 --- a/src/plugins/networkinformationbackends/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp +++ b/src/plugins/networkinformationbackends/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp @@ -305,10 +305,7 @@ QNetworkListManagerNetworkInformationBackend::~QNetworkListManagerNetworkInforma { if (comInitFailed) return; - if (monitoring) - stop(); - else - CoUninitialize(); + stop(); } void QNetworkListManagerNetworkInformationBackend::setConnectivity(NLM_CONNECTIVITY newConnectivity) @@ -354,12 +351,13 @@ bool QNetworkListManagerNetworkInformationBackend::start() void QNetworkListManagerNetworkInformationBackend::stop() { - Q_ASSERT(managerEvents); - Q_ASSERT(monitoring); - // Can return false but realistically shouldn't since that would break everything: - managerEvents->stop(); - monitoring = false; - managerEvents.Reset(); + if (monitoring) { + Q_ASSERT(managerEvents); + // Can return false but realistically shouldn't since that would break everything: + managerEvents->stop(); + monitoring = false; + managerEvents.Reset(); + } CoUninitialize(); comInitFailed = true; // we check this value in start() to see if we need to re-initialize |