From 8b1ff2f061db8120a14f7f664f83b2412f7b283b Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Fri, 22 Sep 2006 08:11:06 +0000 Subject: Check discovery checking for CreateBonding --- hcid/dbus-adapter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hcid/dbus-adapter.c b/hcid/dbus-adapter.c index 5ac2f2aa..7986b028 100644 --- a/hcid/dbus-adapter.c +++ b/hcid/dbus-adapter.c @@ -1913,7 +1913,7 @@ static DBusHandlerResult handle_dev_create_bonding_req(DBusConnection *conn, DBu str2ba(peer_addr, &peer_bdaddr); /* check if there is a pending discover: requested by D-Bus/non clients */ - if (dbus_data->disc_active || !dbus_data->pinq_idle) + if (dbus_data->disc_active || (dbus_data->pdisc_active && !dbus_data->pinq_idle)) return error_discover_in_progress(conn, msg); pending_remote_name_cancel(dbus_data); -- cgit