diff options
| author | Tobrun <tobrun@mapbox.com> | 2017-11-10 16:34:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-10 16:34:09 +0100 |
| commit | 199c0cac2573d58483e52abac9e1c6621b0df603 (patch) | |
| tree | 10e53545e300b7e4fa8440875e1cf0a4c9c5c616 | |
| parent | b5140cb3426595646f39aee298ca8306d3bd0a6f (diff) | |
| download | qtlocation-mapboxgl-199c0cac2573d58483e52abac9e1c6621b0df603.tar.gz | |
[android] - harden deselection mechanism for markers (#10403)
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java index 9f256c341b..64b33ad598 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java @@ -302,12 +302,14 @@ class AnnotationManager { } 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); + } } } |