Synchronize model set in simulator context and improved setting of model set in matcher (ignored when same simulator)

This commit is contained in:
Klaus Basan
2018-08-08 04:59:20 +02:00
parent 6897abe912
commit 6548c71521
5 changed files with 17 additions and 7 deletions

View File

@@ -517,8 +517,15 @@ namespace BlackCore
return icao;
}
int CAircraftMatcher::setModelSet(const CAircraftModelList &models, const CSimulatorInfo &simulator)
int CAircraftMatcher::setModelSet(const CAircraftModelList &models, const CSimulatorInfo &simulator, bool forced)
{
if (!simulator.isSingleSimulator()) { return 0; }
if (!forced && m_simulator == simulator && m_modelSet.size() > 0)
{
// same simulator with models
return m_modelSet.size();
}
CAircraftModelList modelsCleaned(models);
const int r1 = modelsCleaned.removeAllWithoutModelString();
const int r2 = modelsCleaned.removeIfExcluded();