diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2017-08-07 08:16:45 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-08-07 08:17:26 +0200 |
| commit | c3c3837b02919a26031d917003898e72585e300b (patch) | |
| tree | 02d2166f1e896327efd8a97df3455fd8359fa2be /src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp | |
| parent | aeeae7bc92f19778a73fb10a09b8949b2c384d39 (diff) | |
| parent | 687ec9eb370e9538264280b58bed4d3b1c889579 (diff) | |
Merge remote-tracking branch 'gerrit/5.9' into dev
Change-Id: I0ed4afd881f483a166a7e1400043f116c491f30c
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp')
| -rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp index 0d6c86f9..303dd67f 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_android.cpp @@ -225,6 +225,9 @@ void QBluetoothDeviceDiscoveryAgentPrivate::stop() return; if (m_active == SDPScanActive) { + if (pendingCancel) + return; + pendingCancel = true; pendingStart = false; bool success = adapter.callMethod<jboolean>("cancelDiscovery"); |