From c13aee2b1fd045df0e5181f70d574fec99b26b3a Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Wed, 6 Feb 2013 22:40:36 +0100 Subject: [PATCH] adapter: Always set new default adapter if current one is removed In case hci_get_route() failed mark first adapter on list as default. This make sure default adapter is always set and that btd_adapter_get_default will not return NULL if at least one adapter is registered. --- src/adapter.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index 886bca1c3..038efc2e4 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -5539,8 +5539,10 @@ static int adapter_unregister(struct btd_adapter *adapter) struct btd_adapter *new_default; new_default = adapter_find_by_id(hci_get_route(NULL)); - if (new_default) - new_default->is_default = true; + if (new_default == NULL) + new_default = adapters->data; + + new_default->is_default = true; } adapter_list = g_list_remove(adapter_list, adapter); -- 2.11.0