summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--hcid/dbus-adapter.c3
-rw-r--r--hcid/dbus.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/hcid/dbus-adapter.c b/hcid/dbus-adapter.c
index 78677a77..3663729e 100644
--- a/hcid/dbus-adapter.c
+++ b/hcid/dbus-adapter.c
@@ -2460,6 +2460,9 @@ static DBusHandlerResult adapter_set_pdiscov_resolve(DBusConnection *conn,
if (!reply)
return DBUS_HANDLER_RESULT_NEED_MEMORY;
+ debug("SetPeriodicDiscoveryNameResolving(%s)",
+ resolve ? "TRUE" : "FALSE");
+
adapter->pdiscov_resolve_names = resolve;
if (adapter->pdiscov_active) {
diff --git a/hcid/dbus.c b/hcid/dbus.c
index a0218f48..59760bca 100644
--- a/hcid/dbus.c
+++ b/hcid/dbus.c
@@ -1145,7 +1145,7 @@ void hcid_dbus_inquiry_complete(bdaddr_t *local)
* Enable resolution again: standard inquiry can be
* received in the periodic inquiry idle state.
*/
- if (adapter->pdiscov_requestor)
+ if (adapter->pdiscov_requestor && adapter->pdiscov_resolve_names)
adapter->discov_type |= RESOLVE_NAME;
/*