diff options
| author | tobrun <tobrun.van.nuland@gmail.com> | 2017-11-07 18:33:02 +0100 |
|---|---|---|
| committer | tobrun <tobrun.van.nuland@gmail.com> | 2017-11-07 19:23:14 +0100 |
| commit | 6b64e3bc7a716276a7c9650780d57cdad694cef7 (patch) | |
| tree | 752ea91a926f0ee9e46f521922aa0cdab3fe3d34 | |
| parent | d29ebe3d3fb8dad6187974edf8273208a4a0680c (diff) | |
| download | qtlocation-mapboxgl-upstream/tvn-harden-deselect.tar.gz | |
[android] - harden deselection mechanism for markersupstream/tvn-harden-deselect
| -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); + } } } |