From: Roger A. Light <roger@atchoo.org>
Date: Fri, 4 Jul 2014 10:51:12 +0000 (+0100)
Subject: Fix incorrect reconnect.
X-Git-Tag: v1.1~16
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=87521d8cc490bd90ecaa01a19f5b37f98ea0978c;p=packages%2Fp%2Fpaho-mqtt.git

Fix incorrect reconnect.

Fix incorrect reconnect that occurred if calling loop_stop() before
disconnect().

Change-Id: I50c0880b1773a0570511ed6473f81f3a6d13d4c8
---

diff --git a/ChangeLog.txt b/ChangeLog.txt
index a960c4f..0827387 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,9 @@
+v1.0.1
+======
+
+- Fix incorrect reconnect that occurred if calling loop_stop() before
+  disconnect().
+
 v1.0
 ====
 
diff --git a/src/paho/mqtt/client.py b/src/paho/mqtt/client.py
index ad9d640..9733571 100755
--- a/src/paho/mqtt/client.py
+++ b/src/paho/mqtt/client.py
@@ -1224,7 +1224,7 @@ class Client(object):
                     run = False
 
             self._state_mutex.acquire()
-            if self._state == mqtt_cs_disconnecting:
+            if self._state == mqtt_cs_disconnecting or run == False:
                 run = False
                 self._state_mutex.release()
             else:
@@ -1232,7 +1232,7 @@ class Client(object):
                 time.sleep(1)
 
                 self._state_mutex.acquire()
-                if self._state == mqtt_cs_disconnecting:
+                if self._state == mqtt_cs_disconnecting or run == False:
                     run = False
                     self._state_mutex.release()
                 else: