diff options
| author | Grant Limberg <glimberg@gmail.com> | 2016-06-30 20:35:32 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2016-06-30 20:35:32 -0700 |
| commit | fe725f999547c7fd525d84f7f06fcf56992dae38 (patch) | |
| tree | 0feadfedd833a7b75eae0df7e5332fcc957186da | |
| parent | 58207b30d1b3da3d5f9e47496d5cdbaab79675ea (diff) | |
| download | infinitytier-fe725f999547c7fd525d84f7f06fcf56992dae38.tar.gz infinitytier-fe725f999547c7fd525d84f7f06fcf56992dae38.zip | |
fix a case where the "Allow Default" checkbox would be enabled when a network wasn't connected.
| -rw-r--r-- | ZeroTier One/ShowNetworksViewController.swift | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/ZeroTier One/ShowNetworksViewController.swift b/ZeroTier One/ShowNetworksViewController.swift index 394a6bdc..a6cfb465 100644 --- a/ZeroTier One/ShowNetworksViewController.swift +++ b/ZeroTier One/ShowNetworksViewController.swift @@ -79,7 +79,21 @@ class ShowNetworksViewController: NSViewController, NSTableViewDelegate, NSTable if network.connected { cell.connectedCheckbox.state = NSOnState - cell.allowDefault.enabled = true + if network.allowDefault { + cell.allowDefault.enabled = true + cell.allowDefault.state = NSOnState + } + else { + cell.allowDefault.state = NSOffState + + if defaultRouteExists(networkList) { + cell.allowDefault.enabled = false + } + else { + cell.allowDefault.enabled = true + } + } + cell.allowGlobal.enabled = true cell.allowManaged.enabled = true } @@ -91,21 +105,6 @@ class ShowNetworksViewController: NSViewController, NSTableViewDelegate, NSTable cell.allowManaged.enabled = false } - - if network.allowDefault { - cell.allowDefault.state = NSOnState - } - else { - cell.allowDefault.state = NSOffState - - if defaultRouteExists(networkList) { - cell.allowDefault.enabled = false - } - else { - cell.allowDefault.enabled = true - } - } - cell.allowGlobal.state = (network.allowGlobal ? NSOnState : NSOffState) cell.allowManaged.state = (network.allowManaged ? NSOnState : NSOffState) |