diff options
| author | Bug Magnet <marco.nikic@mullvad.net> | 2023-08-08 17:14:57 +0200 |
|---|---|---|
| committer | Bug Magnet <marco.nikic@mullvad.net> | 2023-08-08 17:14:57 +0200 |
| commit | 5d00739e09600c4e525c3b5687ddb4f7ec3931fe (patch) | |
| tree | 357f669be268b061f65a0e193e7a163a0fc818b6 | |
| parent | 651233d322e7c2e244b9256c0a2728e10c1fe0da (diff) | |
| parent | 8f17aea19415aa3916ac59ac4a5d2d62518c1e34 (diff) | |
| download | mullvadvpn-5d00739e09600c4e525c3b5687ddb4f7ec3931fe.tar.xz mullvadvpn-5d00739e09600c4e525c3b5687ddb4f7ec3931fe.zip | |
Merge branch 'fix-onsleep-completion'
| -rw-r--r-- | ios/PacketTunnel/PacketTunnelProvider.swift | 5 | ||||
| -rw-r--r-- | ios/PacketTunnel/TunnelMonitor/TunnelMonitor.swift | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ios/PacketTunnel/PacketTunnelProvider.swift b/ios/PacketTunnel/PacketTunnelProvider.swift index 9d23cba3e8..a964215771 100644 --- a/ios/PacketTunnel/PacketTunnelProvider.swift +++ b/ios/PacketTunnel/PacketTunnelProvider.swift @@ -373,9 +373,8 @@ class PacketTunnelProvider: NEPacketTunnelProvider, TunnelMonitorDelegate { } override func sleep(completionHandler: @escaping () -> Void) { - tunnelMonitor.onSleep { - completionHandler() - } + tunnelMonitor.onSleep() + completionHandler() } override func wake() { diff --git a/ios/PacketTunnel/TunnelMonitor/TunnelMonitor.swift b/ios/PacketTunnel/TunnelMonitor/TunnelMonitor.swift index d0e576f435..8448a89991 100644 --- a/ios/PacketTunnel/TunnelMonitor/TunnelMonitor.swift +++ b/ios/PacketTunnel/TunnelMonitor/TunnelMonitor.swift @@ -312,7 +312,7 @@ final class TunnelMonitor: PingerDelegate { } } - func onSleep(completion: @escaping () -> Void) { + func onSleep() { nslock.lock() defer { nslock.unlock() } |