Skip to content

Q
qgroundcontrol
Commit af486855 authored by Don Gagne's avatar Don Gagne
Browse files
Options

Fix merge screwup

parent 01fd0113
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
src/uas/QGCUASFileManager.cc
View file @ af486855
...@@ -161,7 +161,6 @@ void QGCUASFileManager::_listAckResponse(Request* listAck) ...@@ -161,7 +161,6 @@ void QGCUASFileManager::_listAckResponse(Request* listAck)
uint8_t cBytesLeft = cBytes - offset; uint8_t cBytesLeft = cBytes - offset;
uint8_t nlen = static_cast<uint8_t>(strnlen(ptr, cBytesLeft)); uint8_t nlen = static_cast<uint8_t>(strnlen(ptr, cBytesLeft));
if ((*ptr == 'S' && nlen > 1) || (*ptr != 'S' && nlen < 2)) { if ((*ptr == 'S' && nlen > 1) || (*ptr != 'S' && nlen < 2)) {
if (nlen < 2) {
_currentOperation = kCOIdle; _currentOperation = kCOIdle;
_emitErrorMessage(tr("Incorrectly formed list entry: '%1'").arg(ptr)); _emitErrorMessage(tr("Incorrectly formed list entry: '%1'").arg(ptr));
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment