diff options
author | tobrun <tobrun.van.nuland@gmail.com> | 2017-11-29 07:50:24 +0100 |
---|---|---|
committer | tobrun <tobrun.van.nuland@gmail.com> | 2017-11-29 17:51:38 +0100 |
commit | 9fe467d90d9a2864ea97af534633380a9ffa9c6b (patch) | |
tree | f022b5d5012717c3ebce7b0ef5352f5463609ebc | |
parent | 8757164ac8f2b033b2b12d4baf075ed18cfeb2b4 (diff) | |
download | qtlocation-mapboxgl-upstream/tvn-destroy-harden.tar.gz |
[android] - handle destroying activity programmatically as part of theme switchingupstream/tvn-destroy-harden
-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 beb51d7b68..c468ecbc8c 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(); |