]> git.ipfire.org Git - thirdparty/wireguard-apple.git/commitdiff
macOS: Fix 'Network' entry in menu
authorRoopesh Chander <roop@roopc.net>
Tue, 8 Jan 2019 21:19:46 +0000 (02:49 +0530)
committerRoopesh Chander <roop@roopc.net>
Mon, 14 Jan 2019 09:22:35 +0000 (14:52 +0530)
Signed-off-by: Roopesh Chander <roop@roopc.net>
WireGuard/WireGuard/UI/macOS/StatusMenu.swift

index 39c0f32b3325691ca65ef47ff1af46c05c39dc3d..add91ae5357c3159dc81a76015757afbe771b3c0 100644 (file)
@@ -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
     }