diff options
| author | mltownsend <mltownsend@gmail.com> | 2009-08-11 22:34:28 +0000 |
|---|---|---|
| committer | mltownsend <mltownsend@gmail.com> | 2009-08-11 22:34:28 +0000 |
| commit | 9c4f6b6fd05acc7e10ac50ddf66eb25f5cf9344f (patch) | |
| tree | f8b3eb673e74029ae407a5a32f131a2a49bb72cd | |
| parent | 3a011f58742e4b3ea830501a5303a2c37f072151 (diff) | |
| download | sequelpro-9c4f6b6fd05acc7e10ac50ddf66eb25f5cf9344f.tar.gz sequelpro-9c4f6b6fd05acc7e10ac50ddf66eb25f5cf9344f.tar.bz2 sequelpro-9c4f6b6fd05acc7e10ac50ddf66eb25f5cf9344f.zip | |
Fix problem with opening and reopening connections
| -rw-r--r-- | Interfaces/English.lproj/UserManagerView.xib | 10 | ||||
| -rw-r--r-- | Source/SPUserManager.m | 10 | ||||
| -rw-r--r-- | Source/TableDocument.h | 9 | ||||
| -rw-r--r-- | Source/TableDocument.m | 5 |
4 files changed, 21 insertions, 13 deletions
diff --git a/Interfaces/English.lproj/UserManagerView.xib b/Interfaces/English.lproj/UserManagerView.xib index 5e91154e..2961ebd1 100644 --- a/Interfaces/English.lproj/UserManagerView.xib +++ b/Interfaces/English.lproj/UserManagerView.xib @@ -2481,6 +2481,14 @@ </object> <int key="connectionID">604</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delegate</string> + <reference key="source" ref="1044129360"/> + <reference key="destination" ref="1001"/> + </object> + <int key="connectionID">605</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -3680,7 +3688,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">604</int> + <int key="maxID">605</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> 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]; } |