From 17650954fdcb991ed84f3aa07ef95df2a930bdca Mon Sep 17 00:00:00 2001
From: DonLakeFlyer <don@thegagnes.com>
Date: Wed, 4 Apr 2018 09:08:08 -0700
Subject: [PATCH] Fix parsing order

---
 src/AnalyzeView/ULogParser.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/AnalyzeView/ULogParser.cc b/src/AnalyzeView/ULogParser.cc
index 8a7e172bcd..806dfd052e 100644
--- a/src/AnalyzeView/ULogParser.cc
+++ b/src/AnalyzeView/ULogParser.cc
@@ -139,15 +139,10 @@ bool ULogParser::getTagsFromLog(QByteArray& log, QList<GeoTagWorker::cameraFeedb
 
             case (int)ULogMessageType::DATA:
             {
-                if (!geotagFound) {
-                    qWarning() << "Could not detect geotag packets in ULog";
-                    return false;
-                }
-
                 uint16_t msgID = -1;
                 memcpy(&msgID, log.data() + index + ULOG_MSG_HEADER_LEN, 2);
 
-                if(msgID == _cameraCaptureMsgID) {
+                if (geotagFound && msgID == _cameraCaptureMsgID) {
 
                     // Completely dynamic parsing, so that changing/reordering the message format will not break the parser
                     GeoTagWorker::cameraFeedbackPacket feedback;
@@ -179,5 +174,10 @@ bool ULogParser::getTagsFromLog(QByteArray& log, QList<GeoTagWorker::cameraFeedb
 
     }
 
+    if (cameraFeedback.count() == 0) {
+        qWarning() << "Could not detect camera_capture packets in ULog";
+        return false;
+    }
+
     return true;
 }
-- 
GitLab