From 001d90bd6bd828ccbcae3b381c7e9382880161a5 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Tue, 5 Feb 2019 15:57:54 +0100
Subject: [PATCH] Ref T529, using sort order in model loader

---
 src/blackmisc/simulation/aircraftmodelloader.cpp              | 1 +
 src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp       | 2 ++
 src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp | 1 +
 3 files changed, 4 insertions(+)

diff --git a/src/blackmisc/simulation/aircraftmodelloader.cpp b/src/blackmisc/simulation/aircraftmodelloader.cpp
index fc679b726..de5a76704 100644
--- a/src/blackmisc/simulation/aircraftmodelloader.cpp
+++ b/src/blackmisc/simulation/aircraftmodelloader.cpp
@@ -144,6 +144,7 @@ namespace BlackMisc
                                               u"Empty or not existing '%1' directory '%2', skipping read")
                                               << simulator.toQString() << modelDirectories.join(", ");
                 m_loadingMessages.push_back(status);
+                m_loadingMessages.freezeOrder();
                 emit this->loadingFinished(m_loadingMessages, simulator, LoadingSkipped);
                 return;
             }
diff --git a/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp b/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp
index a2fe9c186..808396deb 100644
--- a/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp
+++ b/src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp
@@ -104,6 +104,7 @@ namespace BlackMisc
                         }
                         else
                         {
+                            m_loadingMessages.freezeOrder();
                             emit this->loadingFinished(m_loadingMessages, simulator, ParsedData);
                         }
                     });
@@ -116,6 +117,7 @@ namespace BlackMisc
                     m_parsedCfgEntriesList = this->performParsing(modelDirs, excludedDirectoryPatterns, msgs);
                     const CAircraftModelList models(m_parsedCfgEntriesList.toAircraftModelList(simulator, true, msgs));
                     m_loadingMessages = msgs;
+                    m_loadingMessages.freezeOrder();
                     const bool hasData = !models.isEmpty();
                     if (hasData)
                     {
diff --git a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp
index 6310f9aa9..0eb940c8f 100644
--- a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp
+++ b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp
@@ -127,6 +127,7 @@ namespace BlackMisc
                     m_parserWorker->thenWithResult<CAircraftModelList>(this, [ = ](const auto & models)
                     {
                         this->updateInstalledModels(models);
+                        m_loadingMessages.freezeOrder();
                         emit this->loadingFinished(m_loadingMessages, simulator, ParsedData);
                     });
                 }