diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/dbus-hci.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/dbus-hci.c b/src/dbus-hci.c index 562e6652..8059478d 100644 --- a/src/dbus-hci.c +++ b/src/dbus-hci.c @@ -753,17 +753,6 @@ void hcid_dbus_inquiry_result(bdaddr_t *local, bdaddr_t *peer, uint32_t class, create_name(filename, PATH_MAX, STORAGEDIR, local_addr, "names"); name = textfile_get(filename, peer_addr); - if (!alias) { - real_alias = NULL; - - if (!name) { - alias = g_strdup(peer_addr); - g_strdelimit(alias, ":", '-'); - } else - alias = g_strdup(name); - } else - real_alias = alias; - tmp_name = extract_eir_name(data, &name_type); if (tmp_name) { if (name_type == 0x09) { @@ -782,6 +771,17 @@ void hcid_dbus_inquiry_result(bdaddr_t *local, bdaddr_t *peer, uint32_t class, } } + if (!alias) { + real_alias = NULL; + + if (!name) { + alias = g_strdup(peer_addr); + g_strdelimit(alias, ":", '-'); + } else + alias = g_strdup(name); + } else + real_alias = alias; + path = adapter_get_path(adapter); icon = class_to_icon(class); |