sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 01:18:36 +02:00
Code Issues Projects Releases Wiki Activity

Resolve merge conflicts master into devicesettings

Browse Source
This commit is contained in:
Paul Hollinsky
2018-09-26 18:24:59 -04:00
parent a5b79167b9 4c45b235bc
commit 399c72e61d
40 changed files with 142 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
communication/packetizer.cpp
+1 -1
View File
@@ -86,7 +86,7 @@ bool Packetizer::input(const std::vector<uint8_t>& inputBytes) {
break;
case ReadState::GetData:
// We do not include the checksum in packetLength so it doesn't get copied into the payload buffer
if(bytes.size() < packetLength + (checksum ? 1 : 0)) { // Read until we have the rest of the packet
if(bytes.size() < (size_t)(packetLength + (checksum ? 1 : 0))) { // Read until we have the rest of the packet
haveEnoughData = false;
break;
}