Merge pull request liodali#485 from vargab95/master

fix null pointer exception in map drawing
Bischel · Dec 6, 2023 · c09e506 · c09e506
2 parents 70c81e0 + c6d5e2c
commit c09e506
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/android/src/main/kotlin/hamza/dali/flutter_osm_plugin/overlays/CustomLocation.kt b/android/src/main/kotlin/hamza/dali/flutter_osm_plugin/overlays/CustomLocation.kt
@@ -156,9 +156,11 @@ class CustomLocationManager(mapView: MapView) : MyLocationNewOverlay(mapView) {
                 }
             }
             else -> {
-                when (lastFix.hasBearing()) {
-                    true -> drawDirection(canvas, pProjection, lastFix)
-                    else -> drawPerson(canvas, pProjection, lastFix)
+                if (lastFix != null) {
+                    when (lastFix.hasBearing()) {
+                        true -> drawDirection(canvas, pProjection, lastFix)
+                        else -> drawPerson(canvas, pProjection, lastFix)
+                    }
                 }
             }
         }
@@ -233,4 +235,4 @@ class CustomLocationManager(mapView: MapView) : MyLocationNewOverlay(mapView) {
         setPersonAnchor(anchor.first().toFloat(),anchor.last().toFloat())
         setDirectionAnchor(anchor.first().toFloat(),anchor.last().toFloat())
     }
-}
+}