From df27ec0614e2c264ce3b485604f579661fe803fb Mon Sep 17 00:00:00 2001 From: Andrzej Kaczmarek Date: Thu, 22 Mar 2018 16:20:59 +0100 Subject: [PATCH] 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. Change-Id: I045bc1964f0951f6fae4d116acb973d70161a801 Signed-off-by: Amit Purwar --- src/shared/gatt-client.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/shared/gatt-client.c b/src/shared/gatt-client.c index a681f26..ac308b6 100644 --- a/src/shared/gatt-client.c +++ b/src/shared/gatt-client.c @@ -650,10 +650,13 @@ static bool discover_descs(struct discovery_op *op, bool *discovering) /* 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; } -- 2.7.4