Update layer removal to be consistent with #7962

1 files changed, 12 insertions, 1 deletions

diff --git a/platform/darwin/src/MGLComputedShapeSource.mm b/platform/darwin/src/MGLComputedShapeSource.mm
index f65e898271..b4e4a6c54a 100644
--- a/platform/darwin/src/MGLComputedShapeSource.mm
+++ b/platform/darwin/src/MGLComputedShapeSource.mm
@@ -136,9 +136,20 @@
 
 - (void)removeFromMapView:(MGLMapView *)mapView {
     [self.requestQueue cancelAllOperations];
+    if (self.rawSource != mapView.mbglMap->getSource(self.identifier.UTF8String)) {
+        return;
+    }
+    
     auto removedSource = mapView.mbglMap->removeSource(self.identifier.UTF8String);
     
-    _pendingSource = std::move(reinterpret_cast<std::unique_ptr<mbgl::style::CustomVectorSource> &>(removedSource));
+    mbgl::style::CustomVectorSource *source = dynamic_cast<mbgl::style::CustomVectorSource *>(removedSource.get());
+    if (!source) {
+        return;
+    }
+    
+    removedSource.release();
+    
+    _pendingSource = std::unique_ptr<mbgl::style::CustomVectorSource>(source);
     self.rawSource = _pendingSource.get();
 }