Merge pull request #345 from ivpn/bugfix/app-remains-in-disconnecting…

…-state App remains on "disconnecting" state
ivpn · May 17, 2023 · 2bcfcd3 · 2bcfcd3
2 parents 51238f7 + 2d856e8
commit 2bcfcd3
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/IVPNClient/Managers/VPNManager.swift b/IVPNClient/Managers/VPNManager.swift
@@ -240,13 +240,17 @@ class VPNManager {
         case .openvpn:
             self.disable(tunnelType: .ipsec) { _ in
                 self.disable(tunnelType: .wireguard) { _ in
-                    self.setup(settings: settings, accessDetails: accessDetails, status: .disconnected) { _ in }
+                    self.setup(settings: settings, accessDetails: accessDetails, status: .disconnected) { _ in
+                        self.disconnect(tunnelType: .openvpn)
+                    }
                 }
             }
         case .wireguard:
             self.disable(tunnelType: .ipsec) { _ in
                 self.disable(tunnelType: .openvpn) { _ in
-                    self.setup(settings: settings, accessDetails: accessDetails, status: .disconnected) { _ in }
+                    self.setup(settings: settings, accessDetails: accessDetails, status: .disconnected) { _ in
+                        self.disconnect(tunnelType: .wireguard)
+                    }
                 }
             }
         }
@@ -265,7 +269,9 @@ class VPNManager {
 
     func disconnect(tunnelType: TunnelType, reconnectAutomatically: Bool = false) {
         getManagerFor(tunnelType: tunnelType) { manager in
-            manager.connection.stopVPNTunnel()
+            DispatchQueue.async {
+                manager.connection.stopVPNTunnel()
+            }
 
             if !UserDefaults.shared.networkProtectionEnabled || reconnectAutomatically {
                 self.removeOnDemandRule(manager: manager)