From 721c6d564e496c964c2e784ff939c64f365f8668 Mon Sep 17 00:00:00 2001
From: Don Gagne <dongagne@outlook.com>
Date: Mon, 29 Oct 2018 10:49:00 -0700
Subject: [PATCH 1/2] Fix multi-component handling.

---
 src/FactSystem/ParameterManager.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/FactSystem/ParameterManager.cc b/src/FactSystem/ParameterManager.cc
index 78fe43f..98361a8 100644
--- a/src/FactSystem/ParameterManager.cc
+++ b/src/FactSystem/ParameterManager.cc
@@ -347,12 +347,12 @@ void ParameterManager::_parameterUpdate(int vehicleId, int componentId, QString
             // Add meta data to default component. We need to do this before we setup the group map since group
             // map requires meta data.
             _addMetaDataToDefaultComponent();
-        }
 
-        // When we are getting the very last component param index, reset the group maps to update for the
-        // new params. By handling this here, we can pick up components which finish up later than the default
-        // component param set.
-        _setupCategoryMap();
+            // When we are getting the very last component param index, reset the group maps to update for the
+            // new params. By handling this here, we can pick up components which finish up later than the default
+            // component param set.
+            _setupCategoryMap();
+        }
     }
 
     // Update param cache. The param cache is only used on PX4 Firmware since ArduPilot and Solo have volatile params

From f8e005feaade1b3471370a5458300a4a76dbc10e Mon Sep 17 00:00:00 2001
From: Don Gagne <dongagne@outlook.com>
Date: Mon, 29 Oct 2018 10:51:13 -0700
Subject: [PATCH 2/2] Update

---
 ChangeLog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog.md b/ChangeLog.md
index 1fb48eb..3291ec1 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -9,6 +9,7 @@ Note: This file only contains high level features or important fixes.
 * Orbit: Turn off for PX4 since still not supported
 * Structure Scan: Fix loading of structure scan height
 * ArduPilot: Fix location of planned home position when not connected to vehicle. Issue #6840.
+* Fix loading of parameters from multiple components. Would report download complete too early, thus missing all default component params.
 
 ### 3.4.4 - Stable
 * Stable desktop versions now inform user at boot if newer version is available.