From 289e29c6c4a073569c7e7aa3c8fc51ed5c46993f Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Mon, 16 Jun 2008 16:56:38 +0000 Subject: Fix bt_cancel_discovery to only succeed when there is a discover to cancel. --- hcid/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'hcid/device.c') diff --git a/hcid/device.c b/hcid/device.c index f0e57e91..6b9ccac9 100644 --- a/hcid/device.c +++ b/hcid/device.c @@ -1061,7 +1061,10 @@ static DBusMessage *cancel_discover(DBusConnection *conn, str2ba(adapter->address, &src); str2ba(device->address, &dst); - bt_cancel_discovery(&src, &dst); + if (bt_cancel_discovery(&src, &dst) < 0) + return g_dbus_create_error(msg, + ERROR_INTERFACE ".Failed", + "No pending discover"); return dbus_message_new_method_return(msg); } -- cgit