Check for mMapView nil in RCTMGLPointAnnotation removeFromMap

rnmapbox · Jun 8, 2020 · bb7b8d5 · bb7b8d5
1 parent f176a08
commit bb7b8d5
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/...d/rctmgl/src/main/java/com/mapbox/rctmgl/components/annotation/RCTMGLPointAnnotation.java b/...d/rctmgl/src/main/java/com/mapbox/rctmgl/components/annotation/RCTMGLPointAnnotation.java
@@ -113,14 +113,19 @@ public void addToMap(RCTMGLMapView mapView) {
 
     @Override
     public void removeFromMap(RCTMGLMapView mapView) {
+        RCTMGLMapView map = (mMapView != null) ? mMapView : mapView;
+        if (map == null) {
+            return;
+        }
+
         if (mAnnotation != null) {
-            mMapView.getSymbolManager().delete(mAnnotation);
+            map.getSymbolManager().delete(mAnnotation);
         }
         if (mChildView != null) {
-            mMapView.offscreenAnnotationViewContainer().removeView(mChildView);
+            map.offscreenAnnotationViewContainer().removeView(mChildView);
         }
         if (mCalloutView != null) {
-            mMapView.offscreenAnnotationViewContainer().removeView(mCalloutView);
+            map.offscreenAnnotationViewContainer().removeView(mCalloutView);
         }
     }