From a50fa28c08ad226aa5c7a39b492d8c917b577290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20T=C5=AFma?= Date: Sat, 18 Mar 2023 09:51:07 +0100 Subject: [PATCH] Properly chceck for GCS/PCS files --- src/GUI/app.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/GUI/app.cpp b/src/GUI/app.cpp index e18ce0cd..b4d55242 100644 --- a/src/GUI/app.cpp +++ b/src/GUI/app.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #ifdef Q_OS_ANDROID #include #include @@ -154,10 +155,13 @@ void App::loadDatums() QString ellipsoidsFile(ProgramPaths::ellipsoidsFile()); QString gcsFile(ProgramPaths::gcsFile()); - if (ellipsoidsFile.isNull()) + if (!QFileInfo::exists(ellipsoidsFile)) { qWarning("No ellipsoids file found."); - if (gcsFile.isNull()) + ellipsoidsFile = QString(); + } if (!QFileInfo::exists(gcsFile)) { qWarning("No GCS file found."); + gcsFile = QString(); + } if (!ellipsoidsFile.isNull() && !gcsFile.isNull()) { Ellipsoid::loadList(ellipsoidsFile); @@ -170,8 +174,9 @@ void App::loadPCSs() { QString pcsFile(ProgramPaths::pcsFile()); - if (pcsFile.isNull()) + if (!QFileInfo::exists(pcsFile)) { qWarning("No PCS file found."); - else + qWarning("Maps based on a projection different from EPSG:3857 won't work."); + } else PCS::loadList(pcsFile); }