diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2006-09-22 08:11:06 +0000 |
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2006-09-22 08:11:06 +0000 |
| commit | 8b1ff2f061db8120a14f7f664f83b2412f7b283b (patch) | |
| tree | 6ba8cfe276f4221f343668df7d162553b14048fa /hcid/dbus-adapter.c | |
| parent | d6bd57566441595ff844a6ce27b1b1306dfb43af (diff) | |
Check discovery checking for CreateBonding
Diffstat (limited to 'hcid/dbus-adapter.c')
| -rw-r--r-- | hcid/dbus-adapter.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |