diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-10-14 14:15:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-10-14 14:15:54 +0200 |
| commit | c273b642ff142e4d567a62c558e9564d6d8defa4 (patch) | |
| tree | cdfeeb4a03ab78161eb6fcf35806312897de88ee /src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp | |
| parent | db56df7fb05b465bf0e77dd086fc2a7b054ab1d9 (diff) | |
| parent | 245f19122c2a6a112a35ee65556bcf00b6545d87 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta2
Conflicts:
src/bluetooth/doc/src/bluetooth-index.qdoc
Change-Id: If353b4ac63c72d6f94415e1349a206ade4ceb52e
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp index 5376ad2f..2562395a 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_winrt.cpp @@ -441,8 +441,11 @@ void QWinRTBluetoothDeviceDiscoveryWorker::classicBluetoothInfoFromDeviceIdAsync hr = deviceFromIdOperation->put_Completed(Callback<IAsyncOperationCompletedHandler<BluetoothDevice *>> ([thisPointer](IAsyncOperation<BluetoothDevice *> *op, AsyncStatus status) { - if (status == Completed && thisPointer) - thisPointer->onPairedClassicBluetoothDeviceFoundAsync(op, status); + if (thisPointer) { + if (status == Completed) + thisPointer->onPairedClassicBluetoothDeviceFoundAsync(op, status); + --thisPointer->m_pendingPairedDevices; + } return S_OK; }).Get()); if (FAILED(hr)) { @@ -475,8 +478,11 @@ void QWinRTBluetoothDeviceDiscoveryWorker::leBluetoothInfoFromDeviceIdAsync(HSTR hr = deviceFromIdOperation->put_Completed(Callback<IAsyncOperationCompletedHandler<BluetoothLEDevice *>> ([thisPointer] (IAsyncOperation<BluetoothLEDevice *> *op, AsyncStatus status) { - if (status == Completed && thisPointer) - thisPointer->onPairedBluetoothLEDeviceFoundAsync(op, status); + if (thisPointer) { + if (status == Completed) + thisPointer->onPairedBluetoothLEDeviceFoundAsync(op, status); + --thisPointer->m_pendingPairedDevices; + } return S_OK; }).Get()); if (FAILED(hr)) { |