summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/xmlstream.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-08-14 09:55:05 -0700
committerLance Stout <lancestout@gmail.com>2012-08-14 09:55:05 -0700
commitf09adf00142a96d8537f1dbab09db708f1298452 (patch)
tree26d62a9d60a02e2a8e7e821a04c217ca3e966e3d /sleekxmpp/xmlstream/xmlstream.py
parent04dc68f5f63508a512e7fbebc873a85961fdb005 (diff)
parentc6ac64ed2dc4b7a3562d15d030ce3b7f76f941dc (diff)
downloadslixmpp-f09adf00142a96d8537f1dbab09db708f1298452.tar.gz
slixmpp-f09adf00142a96d8537f1dbab09db708f1298452.tar.bz2
slixmpp-f09adf00142a96d8537f1dbab09db708f1298452.tar.xz
slixmpp-f09adf00142a96d8537f1dbab09db708f1298452.zip
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index f56c360e..df06d067 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -678,6 +678,9 @@ class XMLStream(object):
args=(reconnect, wait, send_close))
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:
self.event('session_end', direct=True)
@@ -697,9 +700,6 @@ class XMLStream(object):
if send_close:
self.send_raw(self.stream_footer, now=True)
- if not reconnect:
- self.auto_reconnect = False
-
# Wait for confirmation that the stream was
# closed in the other direction. If we didn't
# send a stream footer we don't need to wait