aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--WireGuard/WireGuard/VPN/TunnelsManager.swift5
1 files changed, 5 insertions, 0 deletions
diff --git a/WireGuard/WireGuard/VPN/TunnelsManager.swift b/WireGuard/WireGuard/VPN/TunnelsManager.swift
index 925b5ce..eb69ccd 100644
--- a/WireGuard/WireGuard/VPN/TunnelsManager.swift
+++ b/WireGuard/WireGuard/VPN/TunnelsManager.swift
@@ -48,6 +48,7 @@ class TunnelsManager {
for tunnel in tunnels {
if (tunnel.status != .inactive) {
currentTunnel = tunnel
+ break
}
}
self.tunnels = tunnels
@@ -439,6 +440,10 @@ class TunnelContainer: NSObject {
}
return
}
+ if (s.status == .resolvingEndpointDomains && connection.status == .disconnected) {
+ // Don't change to .inactive if we're still resolving endpoints
+ return
+ }
s.status = TunnelStatus(from: connection.status)
if (s.status == .inactive) {
s.stopObservingTunnelStatus()