don't remove when not existing

bertmelis · Mar 27, 2023 · f13a01d · f13a01d
1 parent 15041c4
commit f13a01d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/MqttClient.h b/src/MqttClient.h
@@ -149,7 +149,6 @@ class MqttClient {
     espMqttClientTypes::Error error(espMqttClientTypes::Error::SUCCESS);
     espMqttClientInternals::Outbox<OutgoingPacket>::Iterator it = _outbox.emplace(0, error, std::forward<Args>(args) ...);
     if (it && error == espMqttClientTypes::Error::SUCCESS) return true;
-    _outbox.remove(it);
     return false;
   }
 
@@ -158,7 +157,6 @@ class MqttClient {
     espMqttClientTypes::Error error(espMqttClientTypes::Error::SUCCESS);
     espMqttClientInternals::Outbox<OutgoingPacket>::Iterator it = _outbox.emplaceFront(0, error, std::forward<Args>(args) ...);
     if (it && error == espMqttClientTypes::Error::SUCCESS) return true;
-    _outbox.remove(it);
     return false;
   }
 

diff --git a/src/Outbox.h b/src/Outbox.h
@@ -121,6 +121,7 @@ class Outbox {
 
   // remove node at iterator, iterator points to next
   void remove(Iterator& it) {  // NOLINT(runtime/references)
+    if (!it) return;
     Node* node = it._node;
     Node* prev = it._prev;
     ++it;