summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorBrad Leege <bleege@gmail.com>2015-09-24 10:36:36 -0500
committerBrad Leege <bleege@gmail.com>2015-09-24 10:36:36 -0500
commitc3fe83f709839b3faf4900eb67f52053234ea363 (patch)
tree7c49f2aff23346b5fd5d8b17debafbbd3b3af14b /android
parentdb2afca0781494e2d2583c6d83c4bcd198513ebe (diff)
downloadqtlocation-mapboxgl-c3fe83f709839b3faf4900eb67f52053234ea363.tar.gz
#2414 - Add explicit null check for infoWindow
Diffstat (limited to 'android')
-rw-r--r--android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Marker.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Marker.java b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Marker.java
index 17317bffb2..2e76a8d9be 100644
--- a/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Marker.java
+++ b/android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/annotations/Marker.java
@@ -78,7 +78,9 @@ public class Marker extends Annotation {
}
public void hideInfoWindow() {
- infoWindow.close();
+ if (infoWindow != null) {
+ infoWindow.close();
+ }
infoWindowShown = false;
}