From 0a20362ae8b260ff6820bfcac88c6ca4e1608ddc Mon Sep 17 00:00:00 2001 From: Ulisses Furquim Date: Mon, 11 Sep 2006 22:04:45 +0000 Subject: Check for cancellation in the timer handler --- hcid/dbus-rfcomm.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hcid/dbus-rfcomm.c b/hcid/dbus-rfcomm.c index 8142b227..bf5c2fbf 100644 --- a/hcid/dbus-rfcomm.c +++ b/hcid/dbus-rfcomm.c @@ -258,6 +258,11 @@ static gboolean rfcomm_connect_cb_continue(void *data) struct rfcomm_node *node = c->node; int fd; + if (c->canceled) { + error_connect_canceled(c->conn, c->msg); + goto failed; + } + fd = open(node->name, O_RDONLY | O_NOCTTY); if (fd < 0) { if (++c->ntries >= MAX_OPEN_TRIES) { -- cgit