From 14611e905ed63d391f92713ac6b6b0b201559e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Szymon=20Aceda=C5=84ski?= Date: Sun, 26 Feb 2017 20:22:38 +0100 Subject: [PATCH] GUI: do not complain if only NavData is present in scenery folder --- src/GUI/PathsDialog.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/GUI/PathsDialog.cxx b/src/GUI/PathsDialog.cxx index cadf9040a..20041dd43 100644 --- a/src/GUI/PathsDialog.cxx +++ b/src/GUI/PathsDialog.cxx @@ -107,13 +107,15 @@ void AddOnsPage::onAddSceneryPath() SGPath p(path.toStdString()); SGPath objectsPath = p / "Objects"; SGPath terrainPath = p / "Terrain"; + SGPath navdataPath = p / "NavData"; - if (!objectsPath.exists() && !terrainPath.exists()) { + if (!objectsPath.exists() && !terrainPath.exists() && !navdataPath.exists()) { QMessageBox mb; mb.setText(QString("The folder '%1' doesn't appear to contain scenery - add anyway?").arg(path)); mb.setStandardButtons(QMessageBox::Yes | QMessageBox::No); mb.setDefaultButton(QMessageBox::No); - mb.setInformativeText("Added scenery should contain folders called 'Objects' and / or 'Terrain'"); + mb.setInformativeText("Added scenery should contain folders called " + "'Objects' and / or 'Terrain' and / or 'NavData'"); mb.exec(); if (mb.result() == QMessageBox::No) {