Fix segfault on improperly timed reload call

openmobilemaps · May 31, 2024 · 96d37bf · 96d37bf
1 parent 0f23d1e
commit 96d37bf
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/shared/src/map/layers/tiled/vector/Tiled2dMapVectorLayer.cpp b/shared/src/map/layers/tiled/vector/Tiled2dMapVectorLayer.cpp
@@ -519,10 +519,12 @@ void Tiled2dMapVectorLayer::reloadDataSource(const std::string &sourceName) {
 }
 
 void Tiled2dMapVectorLayer::reloadLocalDataSource(const std::string &sourceName, const std::string &geoJson) {
-
     std::lock_guard<std::recursive_mutex> lock(mapDescriptionMutex);
 
-    if (!mapInterface) {
+    auto mapInterface = this->mapInterface;
+    auto mapDescription = this->mapDescription;
+
+    if (!mapInterface || !mapDescription) {
         return;
     }