From dcf29af598cd8ba9f6daa420b84873130162bed6 Mon Sep 17 00:00:00 2001 From: George Talusan Date: Tue, 10 Mar 2026 20:41:15 -0400 Subject: [PATCH] fix the wireguard ui from forgetting tunnels in case of transient errors from keychain --- Sources/WireGuardApp/Tunnel/TunnelsManager.swift | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Sources/WireGuardApp/Tunnel/TunnelsManager.swift b/Sources/WireGuardApp/Tunnel/TunnelsManager.swift index c277f6d68..08540397e 100644 --- a/Sources/WireGuardApp/Tunnel/TunnelsManager.swift +++ b/Sources/WireGuardApp/Tunnel/TunnelsManager.swift @@ -85,8 +85,12 @@ class TunnelsManager { } func reload() { - NETunnelProviderManager.loadAllFromPreferences { [weak self] managers, _ in + NETunnelProviderManager.loadAllFromPreferences { [weak self] managers, error in guard let self = self else { return } + if let error = error { + wg_log(.error, message: "Failed to reload tunnel provider managers: \(error)") + return + } let loadedTunnelProviders = managers ?? [] @@ -745,6 +749,6 @@ extension NETunnelProviderManager { } func isEquivalentTo(_ tunnel: TunnelContainer) -> Bool { - return localizedDescription == tunnel.name && tunnelConfiguration == tunnel.tunnelConfiguration + return localizedDescription == tunnel.name } }