flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 05:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #834, improved default value for last set/models simulator

Browse Source 
Remark: The bug itself was slightly related to the default value, as only the default loader suffered from a not reset flag
This commit is contained in:
Klaus Basan
2016-12-15 02:48:30 +01:00
parent 5107d55115
commit 73ba4e5ff2
6 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/blackmisc/simulation/simulatorinfo.cpp
View File

@@ -230,9 +230,10 @@ namespace BlackMisc
return sim;
}
const CSimulatorInfo CSimulatorInfo::guessDefaultSimulator()
//! \cond PRIVATE
CSimulatorInfo guessDefaultSimulatorImpl()
{
CSimulatorInfo locallyInstalled(getLocallyInstalledSimulators());
static const CSimulatorInfo locallyInstalled(CSimulatorInfo::getLocallyInstalledSimulators());
if (CBuildConfig::isRunningOnLinuxPlatform())
{
return CSimulatorInfo("XPLANE");
@@ -242,8 +243,16 @@ namespace BlackMisc
if (locallyInstalled.fs9()) { return CSimulatorInfo("FS9"); }
// fallback
return CSimulatorInfo("FSX");
return CSimulatorInfo("P3D");
}
//! \endcond
const CSimulatorInfo &CSimulatorInfo::guessDefaultSimulator()
{
static const CSimulatorInfo sim(guessDefaultSimulatorImpl());
return sim;
}
CSimulatorInfo CSimulatorInfo::fromDatabaseJson(const QJsonObject &json, const QString prefix)
{