summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun <tobrun.van.nuland@gmail.com>2017-10-23 06:21:26 +0200
committerTobrun <tobrun@mapbox.com>2017-10-23 22:39:00 +0200
commitaf904467582e79d8dbf2a405776a81131ff1fa11 (patch)
tree36363b2f22ed0f1b62b6842ac66e75f7b3b6974c
parent6dfe4ffaf1916f59ac20be31cc0fb9dc3b03c62f (diff)
downloadqtlocation-mapboxgl-af904467582e79d8dbf2a405776a81131ff1fa11.tar.gz
[android] - null check mapboxMap with onStop invocation
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java5
1 files changed, 4 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 309090ed3f..f4198cdde7 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
@@ -369,7 +369,10 @@ public class MapView extends FrameLayout {
*/
@UiThread
public void onStop() {
- mapboxMap.onStop();
+ if (mapboxMap != null) {
+ // map was destroyed before it was started
+ mapboxMap.onStop();
+ }
ConnectivityReceiver.instance(getContext()).deactivate();
FileSource.getInstance(getContext()).deactivate();
}