Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Validate surface creation before destroying map #10890

Merged
merged 1 commit into from
Jan 11, 2018
Merged

Validate surface creation before destroying map #10890

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -318,6 +319,7 @@ public void onSurfaceCreated(GL10 gl, EGLConfig config) {
}

private void initRenderSurface() {
hasSurface = true;
post(new Runnable() {
@Override
public void run() {
Expand Down Expand Up @@ -406,7 +408,7 @@ public void onDestroy() {
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;
Expand Down