From eba94803b64d4024dbc5209415b7c2eb09c06bef Mon Sep 17 00:00:00 2001 From: Claudio Takahasi Date: Tue, 29 Mar 2011 16:26:29 -0300 Subject: [PATCH] Improve the logic when emitting Discovering signal --- src/adapter.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index c7ffd9905..4ce7e4c0d 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -2831,19 +2831,18 @@ void adapter_set_state(struct btd_adapter *adapter, int state) return; break; case STATE_LE_SCAN: - /* Scanning enabled */ - if (adapter->disc_sessions) { - adapter->stop_discov_id = g_timeout_add(5120, - stop_scanning, - adapter); + discov_active = TRUE; - /* For dual mode: don't send "Discovering = TRUE" */ - if (bredr_capable(adapter) == TRUE) - return; - } + if (!adapter->disc_sessions) + break; - /* LE only */ - discov_active = TRUE; + /* Scanning enabled */ + adapter->stop_discov_id = g_timeout_add(5120, stop_scanning, + adapter); + + /* For dual mode: don't send "Discovering = TRUE" */ + if (bredr_capable(adapter) == TRUE) + return; break; case STATE_IDLE: -- 2.47.3