commit 42c9ea6edf16ba1447125edebf1c43cfedb44329
author Andrew Jeffery <andrew@aj.id.au> Wed Apr 13 18:25:39 2022 +0930
committer Ed Tanous <ed@tanous.net> Fri May 06 21:29:37 2022 +0000
tree ca928626dab4b1ab74e336d05df93df3681aa35e
parent c0da0cc858c36a530f308eec45e286ba92e35b6d

PerformScan: Reorder operations when processing old configuration

recordDiscoveredIdentifiers() doesn't modify the record held in
*fromLastJson, so move it to below pruneRecordExposes() to implement a
logical flow of operations.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: I516e4afa365a218a9042ccdb01e0fa62872a6529

src/PerformScan.cpp

diff --git a/src/PerformScan.cpp b/src/PerformScan.cpp
index 9c621a0..4203cd7 100644
--- a/src/PerformScan.cpp
+++ b/src/PerformScan.cpp
@@ -373,6 +373,9 @@
 
                     pruneRecordExposes(*fromLastJson);
 
+                    recordDiscoveredIdentifiers(usedNames, indexes, probeName,
+                                                *fromLastJson);
+
                     // keep user changes
                     _systemConfiguration[recordName] = *fromLastJson;
                     _missingConfigurations.erase(recordName);
@@ -380,9 +383,6 @@
                     // We've processed the device, remove it and advance the
                     // iterator
                     itr = foundDevices.erase(itr);
-
-                    recordDiscoveredIdentifiers(usedNames, indexes, probeName,
-                                                *fromLastJson);
                 }
 
                 std::optional<std::string> replaceStr;