Merge branch 'location-pin-shown-on-map-when-disconnected-ios-477'

mullvad · Feb 20, 2024 · ab8ab7e · ab8ab7e
2 parents 8186d8f + 481f085
commit ab8ab7e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift b/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift
@@ -161,7 +161,11 @@ class TunnelViewController: UIViewController, RootContainment {
             let center = tunnelRelay.location.geoCoordinate
             mapViewController.setCenter(center, animated: animated) {
                 self.contentView.setAnimatingActivity(false)
-                self.mapViewController.addLocationMarker(coordinate: center)
+
+                // Connection can change during animation, so make sure we're still connected before adding marker.
+                if case .connected = self.tunnelState {
+                    self.mapViewController.addLocationMarker(coordinate: center)
+                }
             }
 
         case .pendingReconnect: