summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabiano FidĂȘncio <fidencio@redhat.com>2016-03-23 01:38:41 +0100
committerFabiano FidĂȘncio <fidencio@redhat.com>2016-03-23 01:38:41 +0100
commitf973df7e54b296f5cd2eca7498aea285a84ab007 (patch)
tree6361d13fef54c2de0ea003e0193673aec1339469
parente81d97cc00558e5af087b65e52acb55bbfcdc01b (diff)
downloadspice-gtk-f973df7e54b296f5cd2eca7498aea285a84ab007.tar.gz
spice-gtk-f973df7e54b296f5cd2eca7498aea285a84ab007.tar.xz
spice-gtk-f973df7e54b296f5cd2eca7498aea285a84ab007.zip
Revert "channel-usbredir: Fix crash due to a Task returning earlier than expected"
This reverts commit 7774b8c0dd85ce2bb311d8bbe1c25deb73970b6e.
-rw-r--r--src/channel-usbredir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/channel-usbredir.c b/src/channel-usbredir.c
index ab90800..0f76126 100644
--- a/src/channel-usbredir.c
+++ b/src/channel-usbredir.c
@@ -296,12 +296,12 @@ static void spice_usbredir_channel_open_acl_cb(
spice_usbredir_channel_open_device(channel, &err);
}
if (err) {
+ g_task_return_error(priv->task, err);
libusb_unref_device(priv->device);
priv->device = NULL;
g_boxed_free(spice_usb_device_get_type(), priv->spice_device);
priv->spice_device = NULL;
priv->state = STATE_DISCONNECTED;
- g_task_return_error(priv->task, err);
} else {
g_task_return_boolean(priv->task, TRUE);
}