Fix problem with opening and reopening connections

3 files changed, 12 insertions, 12 deletions

diff --git a/Source/SPUserManager.m b/Source/SPUserManager.m
index 000880ee..e44c9e51 100644
--- a/Source/SPUserManager.m
+++ b/Source/SPUserManager.m
@@ -102,8 +102,9 @@
 	
 	[imageAndTextCell setEditable:NO];
 	[tableColumn setDataCell:imageAndTextCell];
-		
-	[NSThread detachNewThreadSelector:@selector(_initializeUsers) toTarget:self withObject:nil];
+
+	[self _initializeUsers];
+//	[NSThread detachNewThreadSelector:@selector(_initializeUsers) toTarget:self withObject:nil];
 	[window makeKeyAndOrderFront:nil];
 }
 
@@ -497,6 +498,11 @@
 	}
 }
 
+- (void)windowWillClose:(NSNotification *)notification
+{
+	[[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
 - (BOOL)updateUsers:(NSArray *)updatedUsers
 {
 	for (NSManagedObject *user in updatedUsers) {
diff --git a/Source/TableDocument.h b/Source/TableDocument.h
index 480ef810..9b1a053f 100644
--- a/Source/TableDocument.h
+++ b/Source/TableDocument.h
@@ -34,7 +34,7 @@ enum {
 };
 
 
-@class SPConnectionController;
+@class SPConnectionController, SPUserManager;
 
 /**
  * The TableDocument class controls the primary database view window.
@@ -52,9 +52,7 @@ enum {
 	IBOutlet id extendedTableInfoInstance;
 	IBOutlet id databaseDataInstance;
 	IBOutlet id spHistoryControllerInstance;
-	IBOutlet id spExportControllerInstance;
-	IBOutlet id userManagerInstance;
-	
+	IBOutlet id spExportControllerInstance;	
 
 	IBOutlet NSSearchField *listFilterField;
 
@@ -100,7 +98,8 @@ enum {
 	IBOutlet NSWindow *connectionErrorDialog;
 
 	SPConnectionController *connectionController;
-
+	SPUserManager *userManagerInstance;
+	
 	MCPConnection *mySQLConnection;
 
 	NSMutableArray *variables, *variablesFiltered;
diff --git a/Source/TableDocument.m b/Source/TableDocument.m
index 523031cd..a7c0d176 100644
--- a/Source/TableDocument.m
+++ b/Source/TableDocument.m
@@ -2565,11 +2565,6 @@
 		
 - (void)showUserManager:(id)sender
 {
-	if (userManagerInstance == nil)
-	{
-		userManagerInstance = [[SPUserManager alloc] initWithConnection:mySQLConnection];
-	}
-	
 	[userManagerInstance show];
 }