aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoopesh Chander <roop@roopc.net>2019-01-09 02:49:46 +0530
committerRoopesh Chander <roop@roopc.net>2019-01-14 14:52:35 +0530
commite0af06844dd9548c1d87c15389da1b3d49ccfe38 (patch)
tree891f0f2300b19f534f0792a857d13c66166f9e07
parentmacOS: Ensure a tunnel is selected when '-' is clicked (diff)
downloadwireguard-apple-e0af06844dd9548c1d87c15389da1b3d49ccfe38.tar.xz
wireguard-apple-e0af06844dd9548c1d87c15389da1b3d49ccfe38.zip
macOS: Fix 'Network' entry in menu
Signed-off-by: Roopesh Chander <roop@roopc.net>
Diffstat (limited to '')
-rw-r--r--WireGuard/WireGuard/UI/macOS/StatusMenu.swift14
1 files changed, 9 insertions, 5 deletions
diff --git a/WireGuard/WireGuard/UI/macOS/StatusMenu.swift b/WireGuard/WireGuard/UI/macOS/StatusMenu.swift
index 39c0f32..add91ae 100644
--- a/WireGuard/WireGuard/UI/macOS/StatusMenu.swift
+++ b/WireGuard/WireGuard/UI/macOS/StatusMenu.swift
@@ -86,12 +86,16 @@ class StatusMenu: NSMenu {
statusMenuItem.title = tr(format: "macStatus (%@)", statusText)
- let addresses = tunnel.tunnelConfiguration?.interface.addresses ?? []
- let addressesString = addresses.map { $0.stringRepresentation }.joined(separator: ", ")
- if addressesString.isEmpty {
- networksMenuItem.title = tr("macMenuNetworksNone")
+ if tunnel.status == .inactive {
+ networksMenuItem.title = tr("macMenuNetworksInactive")
} else {
- networksMenuItem.title = tr(format: "macMenuNetworks (%@)", addressesString)
+ let addresses = tunnel.tunnelConfiguration?.interface.addresses ?? []
+ let addressesString = addresses.map { $0.stringRepresentation }.joined(separator: ", ")
+ if addressesString.isEmpty {
+ networksMenuItem.title = tr("macMenuNetworksNone")
+ } else {
+ networksMenuItem.title = tr(format: "macMenuNetworks (%@)", addressesString)
+ }
}
return true
}