- if (!device_connect(self->device, FALSE, elt->downstream->input_listen_addrs,
- &self->conn, NULL, NULL)) {
+ result = device_connect(self->device, FALSE,
+ elt->downstream->input_listen_addrs,
+ &self->conn, &elt->cancelled,
+ self->start_part_mutex, self->abort_cond);
+ if (result == 1 && !elt->cancelled) {