Change map provider from osm to mapboxgl on Linux, to avoid crash

plugins/channelrx/demodadsb/adsbdemodsettings.cpp

@@ -315,10 +315,11 @@ bool ADSBDemodSettings::deserialize(const QByteArray& data)
         d.readBlob(60, &m_geometryBytes);
         d.readBool(61, &m_hidden, false);
         d.readString(62, &m_checkWXAPIKey, "");
-#ifdef LINUX
-        d.readString(63, &m_mapProvider, "mapboxgl");
-#else
         d.readString(63, &m_mapProvider, "osm");
+#ifdef LINUX
+        if (m_mapProvider == "osm") {
+            m_mapProvider = "mapboxgl";
+        }
 #endif
 
         for (int i = 0; i < ADSBDEMOD_COLUMNS; i++) {

plugins/feature/map/mapsettings.cpp

@@ -183,10 +183,11 @@ bool MapSettings::deserialize(const QByteArray& data)
         QByteArray blob;
 
         d.readBool(1, &m_displayNames, true);
-#ifdef LINUX
-        d.readString(2, &m_mapProvider, "mapboxgl");
-#else
         d.readString(2, &m_mapProvider, "osm");
+#ifdef LINUX
+        if (m_mapProvider == "osm") {
+            m_mapProvider = "mapboxgl";
+        }
 #endif
         d.readString(3, &m_mapBoxAPIKey, "");
         d.readString(4, &m_mapBoxStyles, "");