Fix #445 stop listening for updates before stopping/destroying the view

maplibre · Jun 9, 2024 · cae6692 · cae6692
1 parent 8e35f0a
commit cae6692
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/maplibre_gl/android/src/main/java/org/maplibre/maplibregl/MapLibreMapController.java b/maplibre_gl/android/src/main/java/org/maplibre/maplibregl/MapLibreMapController.java
@@ -1770,15 +1770,17 @@ private void destroyMapViewIfNecessary() {
     if (mapView == null) {
       return;
     }
-    mapViewContainer.removeView(mapView);
-    mapView.onStop();
-    mapView.onDestroy();
 
     if (locationComponent != null) {
       locationComponent.setLocationComponentEnabled(false);
     }
     stopListeningForLocationUpdates();
 
+    mapViewContainer.removeView(mapView);
+
+    mapView.onStop();
+    mapView.onDestroy();
+
     mapView = null;
   }