Merge pull request #308 from Krakonos/issue-307-crash-on-download-wit…

…h-no-config FIX: Fixed a crash on download when no server is loaded from config.
openstreetmap · Oct 2, 2024 · 7522394 · 7522394
2 parents 56f772e + 61fac77
commit 7522394
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/Preferences/MerkaartorPreferences.cpp b/src/Preferences/MerkaartorPreferences.cpp
@@ -630,6 +630,11 @@ void MerkaartorPreferences::initialize()
 
     }
 
+    if (theOsmServers.size() == 0) {
+        theOsmServers.append(defaultOsmServerInfo);
+        qDebug(lc_MerkaartorPreferences) << "No OSM servers found, adding default server.";
+    }
+
     //Ensure we have a CacheDir value in QSettings
     if (!g_Merk_Ignore_Preferences)
         Sets->setValue("backgroundImage/CacheDir", Sets->value("backgroundImage/CacheDir", HOMEDIR + "/BackgroundCache"));

diff --git a/src/Utils/OsmServer.h b/src/Utils/OsmServer.h
@@ -46,6 +46,8 @@ struct OsmServerInfo
     int CfgVersion = 1;
 };
 
+OsmServerInfo const defaultOsmServerInfo = OsmServerInfo{true, OsmServerInfo::AuthType::OAuth2Redirect, "https://www.openstreetmap.org/", "", ""};
+
 class IOsmServerImpl : public QObject {
     Q_OBJECT