From: Roopesh Chander <roop@roopc.net>
Date: Tue, 8 Jan 2019 21:19:46 +0000 (+0530)
Subject: macOS: Fix 'Network' entry in menu
X-Git-Tag: 0.0.20190207-1~123
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0af06844dd9548c1d87c15389da1b3d49ccfe38;p=thirdparty%2Fwireguard-apple.git

macOS: Fix 'Network' entry in menu

Signed-off-by: Roopesh Chander <roop@roopc.net>
---

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
     }