From dabf5d0c3a76f9fbe8b866f64f51accf12d1a2a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Paczos?= <lukas.paczos@gmail.com>
Date: Mon, 22 Jul 2019 15:29:52 +0200
Subject: [android] remove layers first when clearing the style

---
 .../src/main/java/com/mapbox/mapboxsdk/maps/Style.java     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'platform/android/MapboxGLAndroidSDK/src/main/java/com')

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java
index 07e0daef54..a449ad8a06 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Style.java
@@ -518,13 +518,6 @@ public class Style {
    */
   void clear() {
     fullyLoaded = false;
-    for (Source source : sources.values()) {
-      if (source != null) {
-        source.setDetached();
-        nativeMap.removeSource(source);
-      }
-    }
-
     for (Layer layer : layers.values()) {
       if (layer != null) {
         layer.setDetached();
@@ -532,6 +525,13 @@ public class Style {
       }
     }
 
+    for (Source source : sources.values()) {
+      if (source != null) {
+        source.setDetached();
+        nativeMap.removeSource(source);
+      }
+    }
+
     for (Map.Entry<String, Bitmap> bitmapEntry : images.entrySet()) {
       nativeMap.removeImage(bitmapEntry.getKey());
       bitmapEntry.getValue().recycle();
-- 
cgit v1.2.1