diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-02 13:12:37 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-02-02 13:12:37 +0100 |
commit | c2b7f094e798d15a9231966a1df897ea124cb745 (patch) | |
tree | 9743949ccdf5937366c250424b98d7b11c7e3bf3 | |
parent | f29aa5e96025939e2040cf1397029a6e608a3ed9 (diff) | |
parent | d1a07d8609e4526059c8d083705f9c3ab7206b58 (diff) |
Merge 5.6 into 5.6.0
Change-Id: I25358eae40c07d8e5ba1224b3508c5fee95d3a85
-rw-r--r-- | src/bluetooth/qlowenergycontroller_bluez.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/bluetooth/qlowenergycontroller_bluez.cpp b/src/bluetooth/qlowenergycontroller_bluez.cpp index b37ae4ad..436b3a43 100644 --- a/src/bluetooth/qlowenergycontroller_bluez.cpp +++ b/src/bluetooth/qlowenergycontroller_bluez.cpp @@ -868,7 +868,14 @@ void QLowEnergyControllerPrivate::processReply( Q_ASSERT(!p.isNull()); if (isErrorResponse) { - readServiceValues(p->uuid, false); //read descriptor values + if (keys.count() == 1) { + // no more descriptors to discover + readServiceValues(p->uuid, false); //read descriptor values + } else { + // hop to the next descriptor + keys.removeFirst(); + discoverNextDescriptor(p, keys, keys.first()); + } break; } |