From f92765d5151f86f8fbd0e3ae9d4cebe4d3207d51 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 24 May 2016 18:25:31 +0200 Subject: [PATCH] refs #661, reset order when creating a new model set (found during demo in meeting) --- src/blackcore/modelsetbuilder.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/blackcore/modelsetbuilder.cpp b/src/blackcore/modelsetbuilder.cpp index 95a5b46dd..cb20a348d 100644 --- a/src/blackcore/modelsetbuilder.cpp +++ b/src/blackcore/modelsetbuilder.cpp @@ -56,17 +56,18 @@ namespace BlackCore // without any information we can not use them modelSet = modelSet.findWithKnownAircraftDesignator(); } + + modelSet = modelSet.matchesSimulator(simulator); modelSet.setModelMode(CAircraftModel::Include); // in sets we only include, exclude means not present in set + if (oprions.testFlag(Incremental)) { if (currentSet.isEmpty()) { return modelSet; } CAircraftModelList copy(currentSet); copy.replaceOrAddModelsWithString(modelSet, Qt::CaseInsensitive); // incremental - return copy.matchesSimulator(simulator); - } - else - { - return modelSet.matchesSimulator(simulator); } + + modelSet.resetOrder(); + return modelSet; } } // ns