Fix CameraPosition NullPointerException

microg · Oct 24, 2024 · 027a6cd · 027a6cd
1 parent 511afe8
commit 027a6cd
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/play-services-maps/core/hms/src/main/kotlin/org/microg/gms/maps/hms/GoogleMap.kt b/play-services-maps/core/hms/src/main/kotlin/org/microg/gms/maps/hms/GoogleMap.kt
@@ -102,7 +102,9 @@ class GoogleMapImpl(private val context: Context, var options: GoogleMapOptions)
         this.view = object : FrameLayout(mapContext) {}
     }
 
-    override fun getCameraPosition(): CameraPosition? = map?.cameraPosition?.toGms()
+    override fun getCameraPosition(): CameraPosition {
+        return map?.cameraPosition?.toGms() ?: CameraPosition(LatLng(0.0, 0.0), 0f, 0f, 0f)
+    }
     override fun getMaxZoomLevel(): Float = toHmsZoom(map?.maxZoomLevel ?: 18.toFloat())
     override fun getMinZoomLevel(): Float = toHmsZoom(map?.minZoomLevel ?: 3.toFloat())