From df331737d1c9ab5e680dfb3fd91897f3179cf4b6 Mon Sep 17 00:00:00 2001 From: "Jay.han" Date: Wed, 18 Nov 2015 14:24:13 -0600 Subject: file transfer: send cancel message when user cancels a transfer When a user cancel's a file transfer, we should send a STATUS_CANCELED message rather than an STATUS_ERROR message. The latter triggers a bug in the vdagent where the file remains opened by the vdagent in the guest and cannot be removed. Signed-off-by: Jonathon Jongsma --- src/channel-main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/channel-main.c b/src/channel-main.c index 8138fd5..18c9b18 100644 --- a/src/channel-main.c +++ b/src/channel-main.c @@ -1922,7 +1922,8 @@ static void file_xfer_read_cb(GObject *source_object, } else if (error) { VDAgentFileXferStatusMessage msg = { .id = self->priv->id, - .result = VD_AGENT_FILE_XFER_STATUS_ERROR, + .result = error->code == G_IO_ERROR_CANCELLED ? + VD_AGENT_FILE_XFER_STATUS_CANCELLED : VD_AGENT_FILE_XFER_STATUS_ERROR, }; agent_msg_queue_many(self->priv->channel, VD_AGENT_FILE_XFER_STATUS, &msg, sizeof(msg), NULL); -- cgit