diff options
author | Tobrun <tobrun@mapbox.com> | 2017-11-30 11:45:40 +0100 |
---|---|---|
committer | Tobrun <tobrun@mapbox.com> | 2017-12-06 12:37:48 +0100 |
commit | bc27322853f5d35d546bc704599298fa3efe77cc (patch) | |
tree | 8bbba794f7cf6bbd062ebffe1937c17027124a32 | |
parent | 8ad3759b9c4b6767202d959a5b75732cc740763d (diff) | |
download | qtlocation-mapboxgl-bc27322853f5d35d546bc704599298fa3efe77cc.tar.gz |
[android] - handle destroying activity programmatically as part of theme switching (#10589)
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java index 2d2dc03022..1f8faf0231 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java @@ -416,8 +416,12 @@ public class MapView extends FrameLayout { public void onDestroy() { destroyed = true; mapCallback.clearOnMapReadyCallbacks(); - nativeMapView.destroy(); - nativeMapView = null; + + if (nativeMapView != null) { + // null when destroying an activity programmatically mapbox-navigation-android/issues/503 + nativeMapView.destroy(); + nativeMapView = null; + } if (mapRenderer != null) { mapRenderer.onDestroy(); |