From 24432e0b9854393655217d1b11374cdb141c9ad0 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Wed, 15 Feb 2017 12:57:44 +0100 Subject: [PATCH] [android] - null checking when invalidating as the invalidate callback can be invoked while the reference to MapView isn't valid anymore. (#8062) --- .../main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java index 1d260cacf..3e5a79f4d 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java @@ -927,7 +927,9 @@ final class NativeMapView { // protected void onInvalidate() { - mapView.onInvalidate(); + if (mapView != null) { + mapView.onInvalidate(); + } } protected void onMapChanged(int rawChange) {