diff options
| author | Grant Limberg <glimberg@gmail.com> | 2016-06-27 17:54:54 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2016-06-27 17:54:54 -0700 |
| commit | 1beacc8c326a2ae11b6cba8eafbbac15fb3ebe05 (patch) | |
| tree | af95c2c133bce781882770fcdc5a44e00e478ff7 | |
| parent | 9f880d07ab140b4f61f188a4d03f58f4f6a8c498 (diff) | |
| download | infinitytier-1beacc8c326a2ae11b6cba8eafbbac15fb3ebe05.tar.gz infinitytier-1beacc8c326a2ae11b6cba8eafbbac15fb3ebe05.zip | |
wire up network delete again
| -rw-r--r-- | ZeroTier One/AppDelegate.swift | 5 | ||||
| -rw-r--r-- | ZeroTier One/NetworkMonitor.swift | 8 | ||||
| -rw-r--r-- | ZeroTier One/ShowNetworksViewController.swift | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/ZeroTier One/AppDelegate.swift b/ZeroTier One/AppDelegate.swift index 25c11229..15560dc4 100644 --- a/ZeroTier One/AppDelegate.swift +++ b/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) diff --git a/ZeroTier One/NetworkMonitor.swift b/ZeroTier One/NetworkMonitor.swift index a653f980..d6ab55ee 100644 --- a/ZeroTier One/NetworkMonitor.swift +++ b/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() diff --git a/ZeroTier One/ShowNetworksViewController.swift b/ZeroTier One/ShowNetworksViewController.swift index 0361f6dc..cb017075 100644 --- a/ZeroTier One/ShowNetworksViewController.swift +++ b/ZeroTier One/ShowNetworksViewController.swift @@ -42,7 +42,7 @@ class ShowNetworksViewController: NSViewController, NSTableViewDelegate, NSTable } func deleteNetworkFromList(nwid: String) { - + netMonitor.deleteSavedNetwork(nwid) } |