flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T320, mixed FSX/FS9 strings

Browse Source
This commit is contained in:
Klaus Basan
2018-09-02 15:01:37 +02:00
committed by Roland Winklmeier
parent f31b43ffcf
commit 809c845a02
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -149,8 +149,8 @@ namespace BlackMisc
Q_UNUSED(i18n);
const Simulator s = getSimulator();
const QString str =
(s.testFlag(FSX) ? QStringLiteral("FS9 ") : QStringLiteral("")) %
(s.testFlag(FS9) ? QStringLiteral("FSX ") : QStringLiteral("")) %
(s.testFlag(FSX) ? QStringLiteral("FSX ") : QStringLiteral("")) %
(s.testFlag(FS9) ? QStringLiteral("FS9 ") : QStringLiteral("")) %
(s.testFlag(P3D) ? QStringLiteral("P3D ") : QStringLiteral("")) %
(s.testFlag(XPLANE) ? QStringLiteral("XPlane ") : QStringLiteral(""));
return str.trimmed();
@@ -280,14 +280,14 @@ namespace BlackMisc
static const CSimulatorInfo locallyInstalled(CSimulatorInfo::getLocallyInstalledSimulators());
if (CBuildConfig::isRunningOnLinuxPlatform())
{
return CSimulatorInfo("XPLANE");
return CSimulatorInfo::xplane();
}
if (locallyInstalled.isP3D()) { return CSimulatorInfo("P3D"); }
if (locallyInstalled.isFSX()) { return CSimulatorInfo("FSX"); }
if (locallyInstalled.isFS9()) { return CSimulatorInfo("FS9"); }
if (locallyInstalled.isP3D()) { return CSimulatorInfo::p3d(); }
if (locallyInstalled.isFSX()) { return CSimulatorInfo::fsx(); }
if (locallyInstalled.isFS9()) { return CSimulatorInfo::fs9(); }
// fallback
return CSimulatorInfo("P3D");
return CSimulatorInfo::p3d();
}
//! \endcond