Block reading data if bad mount point

mavlink · Dec 17, 2024 · 9febc9b · 9febc9b
1 parent cd2b678
commit 9febc9b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/NTRIP/NTRIP.cc b/src/NTRIP/NTRIP.cc
@@ -15,6 +15,8 @@
 #include "PositionManager.h"
 #include "NTRIPSettings.h"
 
+QGC_LOGGING_CATEGORY(NTRIPLog, "NTRIP")
+
 NTRIP::NTRIP(QGCApplication* app, QGCToolbox* toolbox)
     : QGCTool(app, toolbox)
 {
@@ -241,6 +243,11 @@ void NTRIPTCPLink::_readBytes(void)
 
 //    throw new Exception("Got SOURCETABLE - Bad ntrip mount point\n\n" + line);
 
+    if (_state == NTRIPState::uninitialised) {
+      qCDebug(NTRIPLog) << "NTRIP State is uninitialised. Discarding bytes";
+      _socket->readAll();
+      return;
+    }
 
     QByteArray bytes = _socket->readAll();
     _parse(bytes);

diff --git a/src/NTRIP/NTRIP.h b/src/NTRIP/NTRIP.h
@@ -17,6 +17,8 @@
 #include "Drivers/src/rtcm.h"
 #include "RTCM/RTCMMavlink.h"
 
+Q_DECLARE_LOGGING_CATEGORY(NTRIPLog)
+
 class NTRIPSettings;
 
 class NTRIPTCPLink : public QThread

diff --git a/src/QGCLoggingCategory.cc b/src/QGCLoggingCategory.cc
@@ -27,7 +27,6 @@ QGC_LOGGING_CATEGORY(GeotaggingLog,                 "GeotaggingLog")
 QGC_LOGGING_CATEGORY(RTKGPSLog,                     "RTKGPSLog")
 QGC_LOGGING_CATEGORY(GuidedActionsControllerLog,    "GuidedActionsControllerLog")
 QGC_LOGGING_CATEGORY(ADSBVehicleManagerLog,         "ADSBVehicleManagerLog")
-QGC_LOGGING_CATEGORY(NTRIPLog,                      "NTRIPLog")
 QGC_LOGGING_CATEGORY(LocalizationLog,               "LocalizationLog")
 QGC_LOGGING_CATEGORY(VideoAllLog,                   kVideoAllLogCategory)
 QGC_LOGGING_CATEGORY(JoystickLog,                   "JoystickLog")