From: Roger A. Light <roger@atchoo.org>
Date: Fri, 4 Jul 2014 11:09:51 +0000 (+0100)
Subject: Further reconnect fix.
X-Git-Tag: v1.1~15
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=5605f91ac1f46af1e050ae789c760de24db0bc69;p=packages%2Fp%2Fpaho-mqtt.git

Further reconnect fix.

Change-Id: I4225b09eec7586deed80c2ddada314b647154096
---

diff --git a/src/paho/mqtt/client.py b/src/paho/mqtt/client.py
index 9733571..77d939a 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 or run == False:
+            if self._state == mqtt_cs_disconnecting or run is False or self._thread_terminate is True:
                 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 or run == False:
+                if self._state == mqtt_cs_disconnecting or run is False or self._thread_terminate is True:
                     run = False
                     self._state_mutex.release()
                 else: