From dd38dcee5e26fffc0df057399fa0c1533eb9832b Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Tue, 6 Jul 2010 22:11:43 +0200 Subject: [PATCH] don't send a canceld filetransfer. Fixes #3586 --- src/common/protocol/bytestream.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/protocol/bytestream.py b/src/common/protocol/bytestream.py index c4f5578ea..8277ed710 100644 --- a/src/common/protocol/bytestream.py +++ b/src/common/protocol/bytestream.py @@ -596,7 +596,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): raise xmpp.NodeProcessed if real_id.startswith('au_'): - if 'stopped' in file and file_props['stopped']: + if 'stopped' in file_props and file_props['stopped']: self.remove_transfer(file_props) else: gajim.socks5queue.send_file(file_props, self.name) @@ -608,6 +608,9 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): if proxyhost['jid'] == jid: proxy = proxyhost + if 'stopped' in file_props and file_props['stopped']: + self.remove_transfer(file_props) + raise xmpp.NodeProcessed if proxy is not None: file_props['streamhost-used'] = True if 'streamhosts' not in file_props: @@ -622,10 +625,7 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): raise xmpp.NodeProcessed else: - if 'stopped' in file_props and file_props['stopped']: - self.remove_transfer(file_props) - else: - gajim.socks5queue.send_file(file_props, self.name) + gajim.socks5queue.send_file(file_props, self.name) if 'fast' in file_props: fasts = file_props['fast'] if len(fasts) > 0: