diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-09-18 10:37:04 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-09-18 10:37:04 -0700 |
| commit | d385b9e708e9e8904ed9a19ac01096c50d521eff (patch) | |
| tree | 305bdaa02f6abf473a411797c0519633bb140b06 /sleekxmpp/xmlstream/xmlstream.py | |
| parent | 67147570e9be7f51fd079c98f1d6db35fe28563c (diff) | |
| parent | c2ae1ee8910a60902ec4aa709ef7c26376eede47 (diff) | |
| download | slixmpp-d385b9e708e9e8904ed9a19ac01096c50d521eff.tar.gz slixmpp-d385b9e708e9e8904ed9a19ac01096c50d521eff.tar.bz2 slixmpp-d385b9e708e9e8904ed9a19ac01096c50d521eff.tar.xz slixmpp-d385b9e708e9e8904ed9a19ac01096c50d521eff.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
| -rw-r--r-- | sleekxmpp/xmlstream/xmlstream.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index 246bc205..a58b63d4 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -420,6 +420,8 @@ class XMLStream(object): :param reattempt: Flag indicating if the socket should reconnect after disconnections. """ + self.stop.clear() + if host and port: self.address = (host, int(port)) try: @@ -452,7 +454,6 @@ class XMLStream(object): def _connect(self, reattempt=True): self.scheduler.remove('Session timeout check') - self.stop.clear() if self.reconnect_delay is None or not reattempt: delay = 1.0 |