summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBug Magnet <marco.nikic@mullvad.net>2025-02-06 15:39:54 +0100
committerBug Magnet <marco.nikic@mullvad.net>2025-02-06 15:39:54 +0100
commitd2317ac641f487aa83affc6c6570d29961db4668 (patch)
tree2e542a7add74e390fb8b8a56ce9960b8b5c36294
parenta22fd70eb940c75bfe52b4daa3becd8f3d24ce99 (diff)
parentcc9df0b9ff1f51761d2fb7b3ab52dcefe96a8b5c (diff)
downloadmullvadvpn-d2317ac641f487aa83affc6c6570d29961db4668.tar.xz
mullvadvpn-d2317ac641f487aa83affc6c6570d29961db4668.zip
Merge branch 'spinner-lags-behind-connection-status-ios-1040'
-rw-r--r--ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift10
1 files changed, 3 insertions, 7 deletions
diff --git a/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift b/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift
index aa74ec5a6b..b7cdeb454d 100644
--- a/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift
+++ b/ios/MullvadVPN/View controllers/Tunnel/TunnelViewController.swift
@@ -177,13 +177,9 @@ class TunnelViewController: UIViewController, RootContainment {
case let .connected(tunnelRelays, _, _):
let center = tunnelRelays.exit.location.geoCoordinate
- mapViewController.setCenter(center, animated: animated) {
- // 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)
- self.activityIndicator.stopAnimating()
- }
- }
+ mapViewController.setCenter(center, animated: animated)
+ activityIndicator.stopAnimating()
+ mapViewController.addLocationMarker(coordinate: center)
case .pendingReconnect:
activityIndicator.startAnimating()