Browse Source

wire up network delete again

Grant Limberg 9 years ago
parent
commit
1beacc8c32

+ 4 - 1
ZeroTier One/AppDelegate.swift

@@ -41,8 +41,11 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
         joinNetworkPopover.appearance = NSAppearance(named: NSAppearanceNameAqua)
 
-        networkListPopover.contentViewController = ShowNetworksViewController(
+        let showNetworksView = ShowNetworksViewController(
             nibName: "ShowNetworksViewController", bundle: nil)
+        showNetworksView?.netMonitor = monitor
+
+        networkListPopover.contentViewController = showNetworksView
         networkListPopover.behavior = .Transient
 
         networkListPopover.appearance = NSAppearance(named: NSAppearanceNameAqua)

+ 8 - 0
ZeroTier One/NetworkMonitor.swift

@@ -62,7 +62,15 @@ class NetworkMonitor: NSObject {
             if index != NSNotFound {
                 allNetworks.removeAtIndex(index)
             }
+
+            let index2 = findSavedNetworkWithID(nwid)
+
+            if index2 != NSNotFound {
+                savedNetworks.removeAtIndex(index2)
+            }
         }
+
+        saveNetworks()
     }
 
     // Only to be called by updateNetworkInfo()

+ 1 - 1
ZeroTier One/ShowNetworksViewController.swift

@@ -42,7 +42,7 @@ class ShowNetworksViewController: NSViewController, NSTableViewDelegate, NSTable
     }
 
     func deleteNetworkFromList(nwid: String) {
-
+        netMonitor.deleteSavedNetwork(nwid)
     }