From 127271cdb6f284662a8f031eeb963ba8d9376d84 Mon Sep 17 00:00:00 2001
From: DoinLakeFlyer <don@thegagnes.com>
Date: Sun, 15 Mar 2020 11:01:54 -0700
Subject: [PATCH] Force consistent setting for offline vehicle

---
 src/qgcunittest/UnitTest.cc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/qgcunittest/UnitTest.cc b/src/qgcunittest/UnitTest.cc
index 5193dbf10..cb4c66174 100644
--- a/src/qgcunittest/UnitTest.cc
+++ b/src/qgcunittest/UnitTest.cc
@@ -17,6 +17,8 @@
 #include "QGCApplication.h"
 #include "MAVLinkProtocol.h"
 #include "Vehicle.h"
+#include "AppSettings.h"
+#include "SettingsManager.h"
 
 #include <QTemporaryFile>
 #include <QTime>
@@ -103,6 +105,11 @@ void UnitTest::init(void)
     }
 
     _linkManager->restart();
+
+    // Force offline vehicle back to defaults
+    AppSettings* appSettings = qgcApp()->toolbox()->settingsManager()->appSettings();
+    appSettings->offlineEditingFirmwareType()->setRawValue(appSettings->offlineEditingFirmwareType()->rawDefaultValue());
+    appSettings->offlineEditingVehicleType()->setRawValue(appSettings->offlineEditingVehicleType()->rawDefaultValue());
     
     _messageBoxRespondedTo = false;
     _missedMessageBoxCount = 0;
-- 
2.22.0