Ref T455, preselect simulator in wizard if there are models

This commit is contained in:
Klaus Basan
2018-12-08 20:11:50 +01:00
parent eacb554053
commit 8d3d5743d3
3 changed files with 22 additions and 8 deletions

View File

@@ -53,17 +53,14 @@ namespace BlackGui
void CConfigSimulatorComponent::preselectSimulators()
{
CSimulatorInfo sims;
if (m_enabledSimulators.isSaved())
CSimulatorInfo sims = m_enabledSimulators.get();
if (!sims.isAnySimulator())
{
sims = CSimulatorInfo(m_enabledSimulators.get());
}
else
{
// by model set
sims = m_modelSets.simulatorsWithInitializedCache();
CSimulatorInfo simWithModels = m_modelSets.simulatorsWithModels();
sims = simWithModels;
}
// no x64 check as we would allow to config 32bit with launcher x64 and vice versa
const bool p3d = (sims.isP3D() || !CFsCommonUtil::p3dDir().isEmpty()) && CBuildConfig::isCompiledWithP3DSupport();
const bool fsx = (sims.isFSX() || !CFsCommonUtil::fsxDir().isEmpty()) && CBuildConfig::isCompiledWithFsxSupport();
const bool fs9 = (sims.isFS9() || !CFsCommonUtil::fs9Dir().isEmpty()) && CBuildConfig::isCompiledWithFs9Support();