From b8d5798beacfa7d3d8d904336005ac2976f02ff3 Mon Sep 17 00:00:00 2001 From: Tobrun Date: Mon, 30 Oct 2017 11:22:47 -0700 Subject: [android] - avoid null pointer if map wasn't initalised when saving instance state --- .../src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'platform/android') 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 de27964a5d..e53d564cd7 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 @@ -329,8 +329,10 @@ public class MapView extends FrameLayout { */ @UiThread public void onSaveInstanceState(@NonNull Bundle outState) { - outState.putBoolean(MapboxConstants.STATE_HAS_SAVED_STATE, true); - mapboxMap.onSaveInstanceState(outState); + if (mapboxMap != null) { + outState.putBoolean(MapboxConstants.STATE_HAS_SAVED_STATE, true); + mapboxMap.onSaveInstanceState(outState); + } } /** -- cgit v1.2.1