From 8a4ad6000a330878dc61b7f13dd21dea337af564 Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Tue, 29 Mar 2011 12:26:42 +0300 Subject: [PATCH] Fix adapter->initialized state tracking Adapters should only be considered initialized when the adapter_init function has successfully completed. --- src/adapter.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index 1d6eef55c..0f237973e 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -2415,10 +2415,8 @@ void btd_adapter_get_mode(struct btd_adapter *adapter, uint8_t *mode, if (main_opts.remember_powered == FALSE) { if (adapter->initialized) *on_mode = get_mode(&adapter->bdaddr, "on"); - else { + else *on_mode = main_opts.mode; - adapter->initialized = TRUE; - } } else if (read_on_mode(address, str, sizeof(str)) < 0) *on_mode = main_opts.mode; else @@ -2735,6 +2733,8 @@ gboolean adapter_init(struct btd_adapter *adapter) * the are active connections before the daemon've started */ load_connections(adapter); + adapter->initialized = TRUE; + return TRUE; } -- 2.47.3