From: Roger Light <roger@atchoo.org>
Date: Mon, 29 Jul 2013 18:40:52 +0000 (+0100)
Subject: Fix QoS 2 reconnect handling.
X-Git-Tag: v0.9~56
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=c73c76a3575cc99c6d64418106c75baebf2aa49e;p=packages%2Fp%2Fpaho-mqtt.git

Fix QoS 2 reconnect handling.
---

diff --git a/src/paho/mqtt/client.py b/src/paho/mqtt/client.py
index 7d329be..f91487f 100755
--- a/src/paho/mqtt/client.py
+++ b/src/paho/mqtt/client.py
@@ -1511,11 +1511,16 @@ class Client:
                     if m.qos == 1:
                         m.state = mqtt_ms_wait_puback
                     elif m.qos == 2:
-                        m.state = mqtt_ms_wait_pubrec
+                        # Preserve current state
+                        pass
                 else:
                     m.state = mqtt_ms_invalid
             else:
-                self._messages.pop(self._messages.index(m))
+                if m.qos != 2:
+                    self._messages.pop(self._messages.index(m))
+                else:
+                    # Preserve current state
+                    pass
         self._message_mutex.release()
 
     def _packet_queue(self, command, packet, mid, qos):