pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-03 04:15:53 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Add check for theoretically impossible comparison, and drop nodenum comparison (#7165)

Browse Source
This commit is contained in:
Jonathan Bennett 2025-06-28 22:54:03 -05:00 committed by GitHub
parent 2bcf608654
commit b6a13f1114
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesh/NodeDB.cpp
View File

@ -1696,6 +1696,8 @@ void NodeDB::sortMeshDB()
lastSort = millis(); lastSort = millis();
std::sort(meshNodes->begin(), meshNodes->begin() + numMeshNodes, std::sort(meshNodes->begin(), meshNodes->begin() + numMeshNodes,
[](const meshtastic_NodeInfoLite &a, const meshtastic_NodeInfoLite &b) { [](const meshtastic_NodeInfoLite &a, const meshtastic_NodeInfoLite &b) {
if (a.num == myNodeInfo.my_node_num && b.num == myNodeInfo.my_node_num) // in theory impossible
return false;
if (a.num == myNodeInfo.my_node_num) { if (a.num == myNodeInfo.my_node_num) {
return true; return true;
} }
@ -1706,9 +1708,7 @@ void NodeDB::sortMeshDB()
bool bFav = b.is_favorite; bool bFav = b.is_favorite;
if (aFav != bFav) if (aFav != bFav)
return aFav; return aFav;
if (a.last_heard != b.last_heard) return a.last_heard > b.last_heard;
return a.last_heard > b.last_heard;
return a.num > b.num;
}); });
} }
} }