[Telepathy-commits] [telepathy-salut/master] salut_file_transfer_channel_close: don't cancel if the channel was already cancelled

[Guillaume Desmottes]

---
 src/salut-file-transfer-channel.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/salut-file-transfer-channel.c b/src/salut-file-transfer-channel.c
index 03e36ca..80b7fab 100644
--- a/src/salut-file-transfer-channel.c
+++ b/src/salut-file-transfer-channel.c
@@ -820,7 +820,8 @@ salut_file_transfer_channel_close (TpSvcChannel *iface,
 {
   SalutFileTransferChannel *self = SALUT_FILE_TRANSFER_CHANNEL (iface);
 
-  if (self->priv->state != SALUT_FILE_TRANSFER_STATE_COMPLETED)
+  if (self->priv->state != SALUT_FILE_TRANSFER_STATE_COMPLETED &&
+      self->priv->state != SALUT_FILE_TRANSFER_STATE_CANCELLED)
     {
       gibber_file_transfer_cancel (self->priv->ft, 406);
       salut_file_transfer_channel_set_state (
-- 
1.5.6.5