[android] - harden deselection mechanism for markers (#10403)

mapbox · Nov 10, 2017 · 199c0ca · 199c0ca
1 parent b5140cb
commit 199c0ca
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/...android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java b/...android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
@@ -302,12 +302,14 @@ void deselectMarkers() {
     }
 
     for (Marker marker : selectedMarkers) {
-      if (marker.isInfoWindowShown()) {
-        marker.hideInfoWindow();
-      }
+      if (marker != null) {
+        if (marker.isInfoWindowShown()) {
+          marker.hideInfoWindow();
+        }
 
-      if (marker instanceof MarkerView) {
-        markerViewManager.deselect((MarkerView) marker, false);
+        if (marker instanceof MarkerView) {
+          markerViewManager.deselect((MarkerView) marker, false);
+        }
       }
     }