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

[XP driver] Fixed failure to find CSL package in certain directory layouts

Browse Source 
Issue reported by Richard Åsberg on Discord. If one package is located
two subdirectories below the parent directory of another, the first one
might not be loaded.
This commit is contained in:
Mat Sutcliffe
2020-02-25 19:43:40 +00:00
parent 7efebad51a
commit ecc38fede7
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -597,7 +597,7 @@ namespace BlackSimPlugin
struct Prefix struct Prefix
{ {
Prefix(const QString &p) : s(p + '/') {} Prefix(const QString &p) : s(p + '/') {}
operator QString() const { return s.chopped(1); } QString parent() const { return s.section('/', 0, -2, QString::SectionSkipEmpty | QString::SectionIncludeLeadingSep); }
bool isPrefixOf(const QString &o) const { return o.startsWith(s); } bool isPrefixOf(const QString &o) const { return o.startsWith(s); }
QString s; QString s;
}; };
@@ -634,8 +634,14 @@ namespace BlackSimPlugin
// comment KB 2019-06 // comment KB 2019-06
// a package is one xsb_aircraft.txt file BB has 9, X-CSL has 76 // a package is one xsb_aircraft.txt file BB has 9, X-CSL has 76
QSet<QString> superpackages;
for (const Prefix& package : as_const(packages))
{
superpackages.insert(package.parent());
}
const QDir simDir = getSimulatorSettings().getSimulatorDirectoryOrDefault(); const QDir simDir = getSimulatorSettings().getSimulatorDirectoryOrDefault();
for (const Prefix &package : as_const(packages)) for (const QString &package : as_const(superpackages))
{ {
if (CDirectoryUtils::isSameOrSubDirectoryOf(package, simDir)) if (CDirectoryUtils::isSameOrSubDirectoryOf(package, simDir))
{ {
@@ -661,7 +667,7 @@ namespace BlackSimPlugin
{ {
if (dir.exists(QStringLiteral("xsb_aircraft.txt"))) if (dir.exists(QStringLiteral("xsb_aircraft.txt")))
{ {
if (dir.cdUp()) { return dir.path(); } return dir.path();
} }
} }
while (dir.cdUp()); while (dir.cdUp());