Merge pull request #809 from jiachin1995/master

Fix loop_stop() not clearing ._thread when called from same thread
eclipse-paho · Mar 27, 2024 · 28aa2e6 · 28aa2e6
2 parents f544b4e + 7a0d184
commit 28aa2e6
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/paho/mqtt/client.py b/src/paho/mqtt/client.py
@@ -2356,7 +2356,6 @@ def loop_stop(self) -> MQTTErrorCode:
         self._thread_terminate = True
         if threading.current_thread() != self._thread:
             self._thread.join()
-            self._thread = None
 
         return MQTTErrorCode.MQTT_ERR_SUCCESS
 
@@ -4514,7 +4513,10 @@ def _handle_on_connect_fail(self) -> None:
                         MQTT_LOG_ERR, 'Caught exception in on_connect_fail: %s', err)
 
     def _thread_main(self) -> None:
-        self.loop_forever(retry_first_connection=True)
+        try:
+            self.loop_forever(retry_first_connection=True)
+        finally:
+            self._thread = None
 
     def _reconnect_wait(self) -> None:
         # See reconnect_delay_set for details