- Alter the variable that currentFavorite tracks to the favourite instead of a copy of the represented node; this addresses a crash on Lion (Issue #1328)

 - Clean up variables and initialisers, restore connection keychain ID tracking and setting

1 files changed, 4 insertions, 1 deletions

diff --git a/Source/SPConnectionControllerInitializer.m b/Source/SPConnectionControllerInitializer.m
index 34f9ca40..a9aa6ca8 100644
--- a/Source/SPConnectionControllerInitializer.m
+++ b/Source/SPConnectionControllerInitializer.m
@@ -56,6 +56,7 @@ static NSString *SPConnectionViewNibName = @"ConnectionView";
 		databaseConnectionView = [dbDocument valueForKey:@"contentViewSplitter"];
 		
 		// Keychain references
+		connectionKeychainID = nil;
 		connectionKeychainItemName = nil;
 		connectionKeychainItemAccount = nil;
 		connectionSSHKeychainItemName = nil;
@@ -68,6 +69,7 @@ static NSString *SPConnectionViewNibName = @"ConnectionView";
 		cancellingConnection = NO;
 		mySQLConnectionCancelled = NO;
 		favoriteNameFieldWasTouched = YES;
+		automaticFavoriteSelection = NO;
 		
 		[self loadNib];
 		[self registerForNotifications];
@@ -92,8 +94,9 @@ static NSString *SPConnectionViewNibName = @"ConnectionView";
 		// and the tree to be constructed.
 		favoritesController = [SPFavoritesController sharedFavoritesController];
 		
-		// Tree reference
+		// Tree references
 		favoritesRoot = [favoritesController favoritesTree];
+		currentFavorite = nil;
 		
 		// Update the UI
 		[self _reloadFavoritesViewData];