diff options
author | Oliver Wolff <oliver.wolff@qt.io> | 2019-07-16 13:03:01 +0200 |
---|---|---|
committer | Oliver Wolff <oliver.wolff@qt.io> | 2019-07-17 07:49:49 +0200 |
commit | 4ac755bb6e51891881b7477702be8ca917b60c8a (patch) | |
tree | bd7f4d517d01dc59b6089f19878a26919f952b13 | |
parent | 8a6d9c307851f3492ddc597f5f03e80f236a7857 (diff) | |
download | qtconnectivity-4ac755bb6e51891881b7477702be8ca917b60c8a.tar.gz |
winrt: Do not try to delete nullptr worker
When calling QBluetoothDeviceDiscoveryAgentPrivate::stop the worker
pointer is cleared in disconnectAndClearWorker so there is no need
to call deleteLater (which will just result in a warning).
Change-Id: I2713474833b61a12018ecfa6f9eb11618ed025a7
Task-number: QTBUG-75089
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp index ef2a69b1..b2554558 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp @@ -606,10 +606,8 @@ void QBluetoothDeviceDiscoveryAgentPrivate::stop() disconnectAndClearWorker(); emit q->canceled(); } - if (leScanTimer) { + if (leScanTimer) leScanTimer->stop(); - worker->deleteLater(); - } } void QBluetoothDeviceDiscoveryAgentPrivate::registerDevice(const QBluetoothDeviceInfo &info) |