When GATT client is destroyed, unset service changed watcher

Change-Id: Ie90820e7fab11434b7d874f0d8da40620e5a1cd9
Signed-off-by: Sudha Bheemanna <b.sudha@samsung.com>

diff --git a/src/bluetooth-gatt.c b/src/bluetooth-gatt.c
index a17cd5bd1a5ce7cc453c65f6d9e433164299a5cf..f790f01fbcf9eaebf53ce3a720a2ab5fc7b0d66c 100644 (file)
--- a/src/bluetooth-gatt.c
+++ b/src/bluetooth-gatt.c
@@ -2816,6 +2816,13 @@ int bt_gatt_client_destroy(bt_gatt_client_h client)
        BT_CHECK_INIT_STATUS();
        BT_CHECK_INPUT_PARAMETER(client); /* LCOV_EXCL_START */
 
+       if (client_s->service_changed_cb) {
+               bluetooth_device_address_t bd_addr = { {0,} };
+
+               _bt_convert_address_to_hex(&bd_addr, client_s->remote_address);
+               bluetooth_gatt_set_service_change_watcher(&bd_addr, FALSE);
+       }
+
        g_free(client_s->remote_address);
        g_slist_free_full(client_s->services, __bt_gatt_free_service);
        gatt_client_list = g_slist_remove(gatt_client_list, client_s);