diff options
| author | Łukasz Paczos <lukas.paczos@gmail.com> | 2018-11-02 13:04:23 +0100 |
|---|---|---|
| committer | Łukasz Paczos <lukasz.paczos@mapbox.com> | 2018-11-05 12:47:40 +0100 |
| commit | cbe14aeadbe341bdffd86e3ec658473091eb893d (patch) | |
| tree | 748c65648674f5ac357336c276adcff4f36606e0 /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | |
| parent | a7d10868686eca58982c6ca9477b557b56c73bb5 (diff) | |
| download | qtlocation-mapboxgl-cbe14aeadbe341bdffd86e3ec658473091eb893d.tar.gz | |
[android] deliver onMapReady only if mapboxMap is not null
(cherry picked from commit a282b19)
Diffstat (limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java')
| -rw-r--r-- | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | 3 |
1 files changed, 2 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 b8edbc479e..29648ddbe2 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 @@ -1071,7 +1071,8 @@ public class MapView extends FrameLayout implements NativeMapView.ViewCallback { */ @UiThread public void getMapAsync(final @NonNull OnMapReadyCallback callback) { - if (mapCallback.isInitialLoad()) { + if (mapCallback.isInitialLoad() || mapboxMap == null) { + // Add callback to the list only if the style hasn't loaded, or the drawing surface isn't ready mapCallback.addOnMapReadyCallback(callback); } else { callback.onMapReady(mapboxMap); |