From cfa3015d32964885c3e477725c01c212ef314c8e Mon Sep 17 00:00:00 2001
From: Nic Hubbard <nic@zedsaid.com>
Date: Tue, 6 Jul 2021 17:40:15 -0700
Subject: [PATCH] Address crash when localFontFamilyName is nil (#109)

---
 platform/ios/platform/ios/src/MGLMapView.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/ios/platform/ios/src/MGLMapView.mm b/platform/ios/platform/ios/src/MGLMapView.mm
index d1deaeeea..163937d5e 100644
--- a/platform/ios/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/platform/ios/src/MGLMapView.mm
@@ -479,7 +479,7 @@ public:
     // setup mbgl map
     MGLRendererConfiguration *config = [MGLRendererConfiguration currentConfiguration];
 
-    auto localFontFamilyName = config.localFontFamilyName ? std::string(config.localFontFamilyName.UTF8String) : nullptr;
+    mbgl::optional<std::string> localFontFamilyName = config.localFontFamilyName ? mbgl::optional<std::string>(std::string(config.localFontFamilyName.UTF8String)) : mbgl::nullopt;
     auto renderer = std::make_unique<mbgl::Renderer>(_mbglView->getRendererBackend(), config.scaleFactor, localFontFamilyName);
     BOOL enableCrossSourceCollisions = !config.perSourceCollisions;
     _rendererFrontend = std::make_unique<MGLRenderFrontend>(std::move(renderer), self, _mbglView->getRendererBackend());