Skip to content

Commit 02dfbf1

Browse files
committed
Removed error if fs-base-genericairports is missing.
1 parent 6f5cdc8 commit 02dfbf1

File tree

3 files changed

+24
-10
lines changed

3 files changed

+24
-10
lines changed

src/fs/navdatabase.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1403,10 +1403,13 @@ void NavDatabase::readSceneryConfigMsfs(atools::fs::scenery::SceneryCfg& cfg)
14031403
// Get version numbers from manifest - needed to determine record changes for SID and STAR
14041404
manifest.clear();
14051405
manifest.read(options->getMsfsOfficialPath() % SEP % "fs-base-genericairports" % SEP % "manifest.json");
1406-
areaGeneric.setMinGameVersion(manifest.getMinGameVersion());
1407-
areaGeneric.setPackageVersion(manifest.getPackageVersion());
14081406

1409-
cfg.appendArea(areaGeneric);
1407+
if(manifest.isValid())
1408+
{
1409+
areaGeneric.setMinGameVersion(manifest.getMinGameVersion());
1410+
areaGeneric.setPackageVersion(manifest.getPackageVersion());
1411+
cfg.appendArea(areaGeneric);
1412+
}
14101413

14111414
// fs-base-nav ======================================================
14121415
SceneryArea areaNav(areaNum++, tr("Base Navigation"), "fs-base-nav");

src/fs/scenery/manifestjson.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ void ManifestJson::read(const QString& filename)
6767
packageVersion = obj.value("package_version").toString();
6868
minGameVersion = obj.value("minimum_game_version").toString();
6969
file.close();
70+
valid = true;
7071
}
7172
else
7273
qWarning() << Q_FUNC_INFO << "Cannot open file" << filename << file.errorString();
@@ -91,6 +92,17 @@ bool ManifestJson::isScenery() const
9192
contentType.compare("MISSION", Qt::CaseInsensitive) != 0;
9293
}
9394

95+
void ManifestJson::clear()
96+
{
97+
contentType.clear();
98+
title.clear();
99+
manufacturer.clear();
100+
creator.clear();
101+
packageVersion.clear();
102+
minGameVersion.clear();
103+
valid = false;
104+
}
105+
94106
} // namespace scenery
95107
} // namespace fs
96108
} // namespace atools

src/fs/scenery/manifestjson.h

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,18 +81,17 @@ class ManifestJson
8181
return minGameVersion;
8282
}
8383

84-
void clear()
84+
void clear();
85+
86+
/* True if file exists and was read */
87+
bool isValid() const
8588
{
86-
contentType.clear();
87-
title.clear();
88-
manufacturer.clear();
89-
creator.clear();
90-
packageVersion.clear();
91-
minGameVersion.clear();
89+
return valid;
9290
}
9391

9492
private:
9593
QString contentType, title, manufacturer, creator, packageVersion, minGameVersion;
94+
bool valid = false;
9695

9796
};
9897

0 commit comments

Comments
 (0)