summaryrefslogtreecommitdiffstats
path: root/hcid/dbus-rfcomm.c
diff options
context:
space:
mode:
authorUlisses Furquim <ulissesf@gmail.com>2006-09-11 22:04:45 +0000
committerUlisses Furquim <ulissesf@gmail.com>2006-09-11 22:04:45 +0000
commit0a20362ae8b260ff6820bfcac88c6ca4e1608ddc (patch)
treec55175246fd8a48814d6af56a6817912b0ebab76 /hcid/dbus-rfcomm.c
parentc52c0f01ba210aa967660799d86cb4402ee13614 (diff)
Check for cancellation in the timer handler
Diffstat (limited to 'hcid/dbus-rfcomm.c')
-rw-r--r--hcid/dbus-rfcomm.c5
1 files changed, 5 insertions, 0 deletions
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) {