From 14b0efe1d4e5addec5f577a2d01a3a0d9a1d931b Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@qt.io>
Date: Fri, 10 May 2019 08:19:47 +0200
Subject: Bluetooth: Compare the server channel when checking for duplicates

It is possible that the service will appear to be the same but have
different server channels. So these services should not be seen as
duplicates as a result.

Change-Id: I36f9c376fcfd9378f4f18c639e87e1a7aad1815b
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
---
 src/bluetooth/qbluetoothservicediscoveryagent.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.cpp b/src/bluetooth/qbluetoothservicediscoveryagent.cpp
index 0f6fdc63..53ce98e5 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent.cpp
+++ b/src/bluetooth/qbluetoothservicediscoveryagent.cpp
@@ -573,7 +573,8 @@ bool QBluetoothServiceDiscoveryAgentPrivate::isDuplicatedService(
         const QBluetoothServiceInfo &info = discoveredServices.at(j);
         if (info.device() == serviceInfo.device()
                 && info.serviceClassUuids() == serviceInfo.serviceClassUuids()
-                && info.serviceUuid() == serviceInfo.serviceUuid()) {
+                && info.serviceUuid() == serviceInfo.serviceUuid()
+                && info.serverChannel() == serviceInfo.serverChannel()) {
             return true;
         }
     }
-- 
cgit v1.2.3