mirror of
https://github.com/meshtastic/firmware.git
synced 2025-06-15 17:42:12 +00:00
Fix: Sporadig crashes and reboot (#2366)
* Fix: Sporadig crashes with reboot
* Revert "Fix: Sporadig crashes with reboot"
This reverts commit 59b65749f5
.
* Fix: Sporadig crashes and reboot
This commit is contained in:
parent
7bbfa48b5d
commit
1f99d4756a
@ -164,13 +164,13 @@ bool ReliableRouter::stopRetransmission(GlobalPacketId key)
|
|||||||
{
|
{
|
||||||
auto old = findPendingPacket(key);
|
auto old = findPendingPacket(key);
|
||||||
if (old) {
|
if (old) {
|
||||||
|
auto p = old->packet;
|
||||||
auto numErased = pending.erase(key);
|
auto numErased = pending.erase(key);
|
||||||
assert(numErased == 1);
|
assert(numErased == 1);
|
||||||
// remove the 'original' (identified by originator and packet->id) from the txqueue and free it
|
// remove the 'original' (identified by originator and packet->id) from the txqueue and free it
|
||||||
cancelSending(getFrom(old->packet), old->packet->id);
|
cancelSending(getFrom(p), p->id);
|
||||||
// now free the pooled copy for retransmission too. tryfix for #2228
|
// now free the pooled copy for retransmission too
|
||||||
if (old->packet)
|
packetPool.release(p);
|
||||||
packetPool.release(old->packet);
|
|
||||||
return true;
|
return true;
|
||||||
} else
|
} else
|
||||||
return false;
|
return false;
|
||||||
|
Loading…
Reference in New Issue
Block a user