From 4df9691345d94ceac9a60d9a3b7aa71327a84e15 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Wed, 10 Sep 2014 12:43:12 -0700
Subject: [PATCH] Fix bug with new kErrFailErrno code

---
 src/uas/QGCUASFileManager.cc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/uas/QGCUASFileManager.cc b/src/uas/QGCUASFileManager.cc
index 526aa211d..36dae2be0 100644
--- a/src/uas/QGCUASFileManager.cc
+++ b/src/uas/QGCUASFileManager.cc
@@ -262,11 +262,13 @@ void QGCUASFileManager::receiveMessage(LinkInterface* link, mavlink_message_t me
                 break;
         }
     } else if (request->hdr.opcode == kRspNak) {
-        Q_ASSERT(request->hdr.size == 1); // Should only have one byte of error code
 
         OperationState previousOperation = _currentOperation;
         uint8_t errorCode = request->data[0];
 
+        // Nak's normally have 1 byte of data for error code, except for kErrFailErrno which has additional byte for errno
+        Q_ASSERT((errorCode == kErrFailErrno && request->hdr.size == 2) || request->hdr.size == 1);
+        
         _currentOperation = kCOIdle;
 
         if (previousOperation == kCOList && errorCode == kErrEOF) {
-- 
2.22.0