AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QNetworkInformation(Win): cleanup dtor

Browse Source 
I don't like how it looks, so make stop() work even if it's not
monitoring so that the dtor can call it unconditionally, and without
needing a CoUninitialize call of its own.

Change-Id: I06832d7e1d34317ff49ea2c425c79588719d7cd0
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Mårten Nordheim 2021-04-13 15:47:09 +02:00
parent 62efc8990d
commit 7ddf834b86
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/networkinformationbackends/networklistmanager/qnetworklistmanagernetworkinformationbackend.cpp
View File

@ -305,10 +305,7 @@ QNetworkListManagerNetworkInformationBackend::~QNetworkListManagerNetworkInforma
{ {
if (comInitFailed) if (comInitFailed)
return; return;
if (monitoring) stop();
stop();
else
CoUninitialize();
} }
void QNetworkListManagerNetworkInformationBackend::setConnectivity(NLM_CONNECTIVITY newConnectivity) void QNetworkListManagerNetworkInformationBackend::setConnectivity(NLM_CONNECTIVITY newConnectivity)
@ -354,12 +351,13 @@ bool QNetworkListManagerNetworkInformationBackend::start()
void QNetworkListManagerNetworkInformationBackend::stop() void QNetworkListManagerNetworkInformationBackend::stop()
{ {
Q_ASSERT(managerEvents); if (monitoring) {
Q_ASSERT(monitoring); Q_ASSERT(managerEvents);
// Can return false but realistically shouldn't since that would break everything: // Can return false but realistically shouldn't since that would break everything:
managerEvents->stop(); managerEvents->stop();
monitoring = false; monitoring = false;
managerEvents.Reset(); managerEvents.Reset();
}
CoUninitialize(); CoUninitialize();
comInitFailed = true; // we check this value in start() to see if we need to re-initialize comInitFailed = true; // we check this value in start() to see if we need to re-initialize