From 2e9b8e320302daef963c6a08259153d832f70088 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Tue, 20 Dec 2022 22:33:58 +0000 Subject: [PATCH] Change map provider from osm to mapboxgl on Linux, to avoid crash --- plugins/channelrx/demodadsb/adsbdemodsettings.cpp | 7 ++++--- plugins/feature/map/mapsettings.cpp | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/plugins/channelrx/demodadsb/adsbdemodsettings.cpp b/plugins/channelrx/demodadsb/adsbdemodsettings.cpp index 32bd5e779..250a7801b 100644 --- a/plugins/channelrx/demodadsb/adsbdemodsettings.cpp +++ b/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++) { diff --git a/plugins/feature/map/mapsettings.cpp b/plugins/feature/map/mapsettings.cpp index 9f35d66c2..265e536bb 100644 --- a/plugins/feature/map/mapsettings.cpp +++ b/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, "");