Upstream: bluetooth: Add the device into hash table when relevant

Fixes BMC#25215

Change-Id: Ic06d2a9eb49802e0b4e97ffe83acd8d19da3e3c4

diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c
index b1cf0c4..1389928 100644 (file)
--- a/plugins/bluetooth.c
+++ b/plugins/bluetooth.c
@@ -660,8 +660,6 @@ static void adapter_properties_reply(DBusPendingCall *call, void *user_data)
        if (device != NULL)
                goto update;
 
-       g_hash_table_insert(bluetooth_devices, g_strdup(path), device);
-
        ether_aton_r(address, &addr);
 
        snprintf(ident, 13, "%02x%02x%02x%02x%02x%02x",
@@ -676,6 +674,8 @@ static void adapter_properties_reply(DBusPendingCall *call, void *user_data)
        if (device == NULL)
                goto done;
 
+       g_hash_table_insert(bluetooth_devices, g_strdup(path), device);
+
        connman_device_set_ident(device, ident);
 
        connman_device_set_string(device, "Path", path);