From e0af06844dd9548c1d87c15389da1b3d49ccfe38 Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Wed, 9 Jan 2019 02:49:46 +0530 Subject: macOS: Fix 'Network' entry in menu Signed-off-by: Roopesh Chander --- WireGuard/WireGuard/UI/macOS/StatusMenu.swift | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'WireGuard/WireGuard/UI') 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 } -- cgit v1.2.3-59-g8ed1b