From ecd66defe59d80b184e1b15c6272c33dbf42744c Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Fri, 8 Feb 2019 00:17:05 +0530 Subject: TunnelsManager: Don't lose .restarting state Signed-off-by: Roopesh Chander --- WireGuard/WireGuard/Tunnel/TunnelsManager.swift | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'WireGuard/WireGuard/Tunnel') diff --git a/WireGuard/WireGuard/Tunnel/TunnelsManager.swift b/WireGuard/WireGuard/Tunnel/TunnelsManager.swift index cd120a5..e5b5984 100644 --- a/WireGuard/WireGuard/Tunnel/TunnelsManager.swift +++ b/WireGuard/WireGuard/Tunnel/TunnelsManager.swift @@ -336,10 +336,8 @@ class TunnelsManager { } } - if (tunnel.status == .restarting) && (session.status == .disconnected || session.status == .disconnecting) { - if session.status == .disconnected { - tunnel.startActivation(activationDelegate: self.activationDelegate) - } + if tunnel.status == .restarting && session.status == .disconnected { + tunnel.startActivation(activationDelegate: self.activationDelegate) return } @@ -442,6 +440,9 @@ class TunnelContainer: NSObject { } func refreshStatus() { + if (status == .restarting) && (tunnelProvider.connection.status == .disconnected || tunnelProvider.connection.status == .disconnecting) { + return + } status = TunnelStatus(from: tunnelProvider.connection.status) isActivateOnDemandEnabled = tunnelProvider.isOnDemandEnabled } -- cgit v1.2.3-59-g8ed1b