From a3e0f17cb36776cc2dff07c1163359c0ccdbbd2a Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Thu, 13 Jul 2023 10:17:28 +0200
Subject: [PATCH] Maps: Fix crash on race condition when unregistering bitmap
 descriptor

---
 .../gms/maps/mapbox/model/BitmapDescriptorFactory.kt      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptorFactory.kt b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptorFactory.kt
index cb5a5e8ca1..6e46de389f 100644
--- a/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptorFactory.kt
+++ b/play-services-maps-core-mapbox/src/main/kotlin/org/microg/gms/maps/mapbox/model/BitmapDescriptorFactory.kt
@@ -89,12 +89,12 @@ object BitmapDescriptorFactoryImpl : IBitmapDescriptorFactoryDelegate.Stub() {
 
         for (map in maps) {
             map.getStyle {
-                try {
-                    runOnMainLooper {
+                runOnMainLooper {
+                    try {
                         it.removeImage(id)
+                    } catch (e: Exception) {
+                        Log.w(TAG, e)
                     }
-                } catch (e: Exception) {
-                    Log.w(TAG, e)
                 }
             }
         }