From e83bd0b824b4fb7ec1909caa648f13792310148c Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Wed, 6 Feb 2013 22:40:35 +0100 Subject: [PATCH] adapter: Mark adapter as default before probing drivers Drivers may depends on adapter being default or not. This fix hostname plugin setting default adapter name to 'foo #1' instead of 'foo' if pretty hostname was received before probing adapter drivers. --- src/adapter.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index 839b0f5a5..886bca1c3 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -5490,6 +5490,9 @@ static int adapter_register(struct btd_adapter *adapter) return -EINVAL; } + if (adapters == NULL) + adapter->is_default = true; + adapters = g_slist_append(adapters, adapter); agent = agent_get(NULL); @@ -5517,9 +5520,6 @@ static int adapter_register(struct btd_adapter *adapter) adapter->initialized = TRUE; - if (g_slist_length(adapters) == 1) - adapter->is_default = true; - if (main_opts.did_source) set_did(adapter, main_opts.did_vendor, main_opts.did_product, main_opts.did_version, main_opts.did_source); -- 2.47.3