commit c8e7911e804b3db30f1745a4085ad8526578b27c
author Andrzej Kaczmarek <andrzej.kaczmarek@codecoup.pl> Thu Mar 22 16:20:59 2018 +0100
committer Luiz Augusto von Dentz <luiz.von.dentz@intel.com> Fri Mar 23 13:19:05 2018 +0200
tree c7dc0101ba48564e4cc62c3727c5f1df646e82c3
parent 009acf56fbcc5af78093dfd36cde2b8935f712f1

shared/gatt-client: Fix removing services from pending list

We should remove from pending list service which was just processed,
not the one that has just started being processed.

src/shared/gatt-client.c

diff --git a/src/shared/gatt-client.c b/src/shared/gatt-client.c
index e1d489d..f0850e0 100644
--- a/src/shared/gatt-client.c
+++ b/src/shared/gatt-client.c
@@ -591,10 +591,13 @@
 		/* Adjust current service */
 		svc = gatt_db_get_service(client->db, chrc_data->value_handle);
 		if (op->cur_svc != svc) {
-			queue_remove(op->pending_svcs, svc);
+			if (op->cur_svc) {
+				queue_remove(op->pending_svcs, op->cur_svc);
 
-			/* Done with the current service */
-			gatt_db_service_set_active(op->cur_svc, true);
+				/* Done with the current service */
+				gatt_db_service_set_active(op->cur_svc, true);
+			}
+
 			op->cur_svc = svc;
 		}