passepartoutvpn
/
wireguard-apple
mirror of https://github.com/passepartoutvpn/wireguard-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UI: When deactivating for activating another tunnel, disable on-demand 

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander 2021-07-27 11:39:07 +05:30
parent abaf1f1454
commit a261d84fc6
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Sources/WireGuardApp/Tunnel/TunnelsManager.swift
View File

@ -419,7 +419,17 @@ class TunnelsManager {
tunnel.status = .waiting tunnel.status = .waiting
activateWaitingTunnelOnDeactivation(of: tunnelInOperation) activateWaitingTunnelOnDeactivation(of: tunnelInOperation)
if tunnelInOperation.status != .deactivating { if tunnelInOperation.status != .deactivating {
startDeactivation(of: tunnelInOperation) if tunnelInOperation.isActivateOnDemandEnabled {
setOnDemandEnabled(false, on: tunnelInOperation) { [weak self] error in
guard error == nil else {
wg_log(.error, message: "Unable to activate tunnel '\(tunnel.name)' because on-demand could not be disabled on active tunnel '\(tunnel.name)'")
return
}
self?.startDeactivation(of: tunnelInOperation)
}
} else {
startDeactivation(of: tunnelInOperation)
}
} }
return return
} }