summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBug Magnet <marco.nikic@mullvad.net>2024-02-20 11:51:07 +0100
committerBug Magnet <marco.nikic@mullvad.net>2024-02-20 11:51:07 +0100
commitab8ab7e0fc3f144ce14a21037cfc348e82751b1d (patch)
tree49ad4800ba0e2b68a762e943a29902d28ebe7aa4
parent8186d8f564cf96cf5fcdc01e31985280a5e884be (diff)
parent481f085f51b548421f3d4bd7ca9991487fdc822d (diff)
downloadmullvadvpn-ab8ab7e0fc3f144ce14a21037cfc348e82751b1d.tar.xz
mullvadvpn-ab8ab7e0fc3f144ce14a21037cfc348e82751b1d.zip
Merge branch 'location-pin-shown-on-map-when-disconnected-ios-477'
-rw-r--r--ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift6
1 files changed, 5 insertions, 1 deletions
diff --git a/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift b/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift
index d5ca5caf2e..d01b3b3133 100644
--- 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: