diff options
| author | Łukasz Paczos <lukas.paczos@gmail.com> | 2018-11-02 13:04:23 +0100 |
|---|---|---|
| committer | Łukasz Paczos <lukas.paczos@gmail.com> | 2018-11-02 13:44:46 +0100 |
| commit | 3215519040c2e7a2f5131898de7549eda42ce32a (patch) | |
| tree | 6310d3d6fcf0f88a7b1e979d78a41be26b4f77ce /platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java | |
| parent | 5a1735859cebefeb5e6e6920bc98d04a691a69e4 (diff) | |
| download | qtlocation-mapboxgl-upstream/lp-on-map-ready-delivery.tar.gz | |
[android] deliver onMapReady only if mapboxMap is not nullupstream/lp-on-map-ready-delivery
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 3b1352e153..3d56e134f6 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 @@ -951,7 +951,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); |