diff options
author | Tobrun <tobrun.van.nuland@gmail.com> | 2018-01-10 14:53:28 +0100 |
---|---|---|
committer | Tobrun <tobrun.van.nuland@gmail.com> | 2018-01-10 14:57:41 +0100 |
commit | 2f9f3e013c687fd437b42b9ef141d836491f9520 (patch) | |
tree | b5fa5f52b57deb07ec72be6aba48eadaa7a193e0 | |
parent | 3d6c80c1aeda0902dc77604ee5d84f83a00f8297 (diff) | |
download | qtlocation-mapboxgl-2f9f3e013c687fd437b42b9ef141d836491f9520.tar.gz |
[android] - check if the render surface has been correctly created before destroying the mapupstream/10813-maprenderer-assertion
-rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | 4 |
1 files changed, 3 insertions, 1 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 256f49ef52..0534f6cf69 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 @@ -72,6 +72,7 @@ public class MapView extends FrameLayout { private NativeMapView nativeMapView; private MapboxMapOptions mapboxMapOptions; private boolean destroyed; + private boolean hasSurface; private MyLocationView myLocationView; private CompassView compassView; @@ -318,6 +319,7 @@ public class MapView extends FrameLayout { } private void initRenderSurface() { + hasSurface = true; post(new Runnable() { @Override public void run() { @@ -406,7 +408,7 @@ public class MapView extends FrameLayout { destroyed = true; mapCallback.clearOnMapReadyCallbacks(); - if (nativeMapView != null) { + if (nativeMapView != null && hasSurface) { // null when destroying an activity programmatically mapbox-navigation-android/issues/503 nativeMapView.destroy(); nativeMapView = null; |