flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-27 02:55:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refs #868 Use CXPlaneUtil::xplaneRootDir() in the X-Plane plugin

Browse Source
This commit is contained in:
Klaus Basan
2017-03-07 19:30:44 +01:00
committed by Mathew Sutcliffe
parent f25d569ae8
commit 99c792dd4b
2 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackmisc/simulation/xplane/xplaneutil.cpp
View File

@@ -140,17 +140,9 @@ namespace BlackMisc
return xbusLegacy; return xbusLegacy;
} }
} }
if (!xplane10Dir().isEmpty())
{ for (auto func: {&CXPlaneUtil::xplane11Dir, &CXPlaneUtil::xplane10Dir, &CXPlaneUtil::xplane9Dir}) {
QString xbusLegacy = xplane10Dir() + legacyPath; QString xbusLegacy = func() + legacyPath;
if (QDir(xbusLegacy).exists())
{
return xbusLegacy;
}
}
if (!xplane9Dir().isEmpty())
{
QString xbusLegacy = xplane9Dir() + legacyPath;
if (QDir(xbusLegacy).exists()) if (QDir(xbusLegacy).exists())
{ {
return xbusLegacy; return xbusLegacy;

4
src/plugins/simulator/xplaneconfig/simulatorxplaneconfigwindow.cpp
View File

@@ -83,9 +83,7 @@ namespace BlackSimPlugin
void CSimulatorXPlaneConfigWindow::ps_installXBus() void CSimulatorXPlaneConfigWindow::ps_installXBus()
{ {
QString xPlaneLocation = BlackMisc::Simulation::XPlane::CXPlaneUtil::xplane10Dir(); QString xPlaneLocation = BlackMisc::Simulation::XPlane::CXPlaneUtil::xplaneRootDir();
if (xPlaneLocation.isEmpty())
xPlaneLocation = BlackMisc::Simulation::XPlane::CXPlaneUtil::xplane9Dir();
QString path = QFileDialog::getExistingDirectory(parentWidget(), QString path = QFileDialog::getExistingDirectory(parentWidget(),
tr("Choose your X-Plane install directory"), tr("Choose your X-Plane install directory"),