pep/slixmpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Lance Stout 2012-08-14 09:55:05 -07:00
commit f09adf0014
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sleekxmpp/xmlstream/xmlstream.py
View file

@ -678,6 +678,9 @@ class XMLStream(object):
args=(reconnect, wait, send_close)) args=(reconnect, wait, send_close))
def _disconnect(self, reconnect=False, wait=None, send_close=True): def _disconnect(self, reconnect=False, wait=None, send_close=True):
if not reconnect:
self.auto_reconnect = False
if self.end_session_on_disconnect or send_close: if self.end_session_on_disconnect or send_close:
self.event('session_end', direct=True) self.event('session_end', direct=True)
@ -697,9 +700,6 @@ class XMLStream(object):
if send_close: if send_close:
self.send_raw(self.stream_footer, now=True) self.send_raw(self.stream_footer, now=True)
if not reconnect:
self.auto_reconnect = False
# Wait for confirmation that the stream was # Wait for confirmation that the stream was
# closed in the other direction. If we didn't # closed in the other direction. If we didn't
# send a stream footer we don't need to wait # send a stream footer we don't need to wait