From b896a77bd7d0241070af8c81515465b6cd539b6d Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Sat, 15 Dec 2012 14:59:28 +0200 Subject: [PATCH] core: Fix adapter name setting when powered off --- src/adapter.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index b962bc142..67537901d 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -769,6 +769,8 @@ void adapter_name_changed(struct btd_adapter *adapter, const char *name) g_free(adapter->name); adapter->name = g_strdup(name); + store_adapter_info(adapter); + g_dbus_emit_property_changed(btd_get_dbus_connection(), adapter->path, ADAPTER_INTERFACE, "Name"); @@ -790,18 +792,7 @@ int adapter_set_name(struct btd_adapter *adapter, const char *name) return -EINVAL; } - if (adapter->up) { - int err = mgmt_set_name(adapter->dev_id, maxname); - if (err < 0) - return err; - } else { - g_free(adapter->name); - adapter->name = g_strdup(maxname); - } - - store_adapter_info(adapter); - - return 0; + return mgmt_set_name(adapter->dev_id, maxname); } static void set_name(struct btd_adapter *adapter, const char *name, -- 2.47.3