From 2a3ce590b5c9e6f31c18b34406f4f88af37947c9 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Fri, 18 Jul 2014 15:13:22 +0300 Subject: [PATCH] core: Move always_pairable check into adapter_set_pairable() --- src/adapter.c | 3 +++ src/agent.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index b2d19dd27..16fd858fc 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -3132,6 +3132,9 @@ void adapter_set_pairable(struct btd_adapter *adapter, bool enable) { bool current = (adapter->current_settings & MGMT_SETTING_PAIRABLE); + if (main_opts.always_pairable) + return; + if (current == enable) return; diff --git a/src/agent.c b/src/agent.c index af96528b5..3e6b92575 100644 --- a/src/agent.c +++ b/src/agent.c @@ -153,8 +153,7 @@ static void set_io_cap(struct btd_adapter *adapter, gpointer user_data) adapter_set_io_capability(adapter, io_cap); - if (!main_opts.always_pairable) - adapter_set_pairable(adapter, agent ? true : false); + adapter_set_pairable(adapter, agent ? true : false); } static bool add_default_agent(struct agent *agent) -- 2.47.3