From ed58467d12914a9be53e47060cf148ab218b499a Mon Sep 17 00:00:00 2001
From: Grant Limberg <grant.limberg@zerotier.com>
Date: Mon, 17 Oct 2016 13:43:27 -0700
Subject: [PATCH] Clicking "Join" to join a new network now properly closes the
 popover

---
 ZeroTier One/AppDelegate.m               | 5 +++--
 ZeroTier One/JoinNetworkViewController.h | 3 +++
 ZeroTier One/JoinNetworkViewController.m | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ZeroTier One/AppDelegate.m b/ZeroTier One/AppDelegate.m
index 9adbaa981..86c83367c 100644
--- a/ZeroTier One/AppDelegate.m	
+++ b/ZeroTier One/AppDelegate.m	
@@ -59,8 +59,9 @@
                                                           object:nil];
 
     [self buildMenu];
-
-    self.joinNetworkPopover.contentViewController = [[JoinNetworkViewController alloc] initWithNibName:@"JoinNetworkViewController" bundle:nil];
+    JoinNetworkViewController *jnvc = [[JoinNetworkViewController alloc] initWithNibName:@"JoinNetworkViewController" bundle:nil];
+    jnvc.appDelegate = self;
+    self.joinNetworkPopover.contentViewController = jnvc;
     self.joinNetworkPopover.behavior = NSPopoverBehaviorTransient;
 
     ShowNetworksViewController *showNetworksView = [[ShowNetworksViewController alloc] initWithNibName:@"ShowNetworksViewController" bundle:nil];
diff --git a/ZeroTier One/JoinNetworkViewController.h b/ZeroTier One/JoinNetworkViewController.h
index 894b4ec25..a928d046c 100644
--- a/ZeroTier One/JoinNetworkViewController.h	
+++ b/ZeroTier One/JoinNetworkViewController.h	
@@ -11,6 +11,8 @@
 
 extern NSString * const JoinedNetworksKey;
 
+@class AppDelegate;
+
 @interface JoinNetworkViewController : NSViewController <NSComboBoxDelegate, NSComboBoxDataSource>
 
 @property (nonatomic, weak) IBOutlet NSComboBox *network;
@@ -18,6 +20,7 @@ extern NSString * const JoinedNetworksKey;
 @property (nonatomic, weak) IBOutlet NSButton *allowManagedCheckBox;
 @property (nonatomic, weak) IBOutlet NSButton *allowGlobalCheckBox;
 @property (nonatomic, weak) IBOutlet NSButton *allowDefaultCheckBox;
+@property (nonatomic, weak) IBOutlet AppDelegate *appDelegate;
 
 @property (nonatomic) NSMutableArray<NSString*> *values;
 
diff --git a/ZeroTier One/JoinNetworkViewController.m b/ZeroTier One/JoinNetworkViewController.m
index d51f7de07..abe8f9597 100644
--- a/ZeroTier One/JoinNetworkViewController.m	
+++ b/ZeroTier One/JoinNetworkViewController.m	
@@ -8,7 +8,7 @@
 
 #import "JoinNetworkViewController.h"
 #import "ServiceCom.h"
-
+#import "AppDelegate.h"
 
 
 NSString * const JoinedNetworksKey = @"com.zerotier.one.joined-networks";
@@ -92,6 +92,8 @@ NSString * const JoinedNetworksKey = @"com.zerotier.one.joined-networks";
             [self.values removeLastObject];
         }
     }
+
+    [self.appDelegate closeJoinNetworkPopover];
 }
 
 // NSComboBoxDelegate methods