- Remove delayed favourite selection call on tab setup. This fixes detail reset issues causing Issue #1362 and Issue #1338, possibly others.

 - Clean up duplicate code setting and resetting connection interface state, ensuring one code path used by all

1 files changed, 5 insertions, 7 deletions

diff --git a/Source/SPConnectionControllerDelegate.m b/Source/SPConnectionControllerDelegate.m
index bbdf7624..567f8e87 100644
--- a/Source/SPConnectionControllerDelegate.m
+++ b/Source/SPConnectionControllerDelegate.m
@@ -45,7 +45,6 @@ static NSString *SPDatabaseImage = @"database-small";
 
 - (NSString *)_stripInvalidCharactersFromString:(NSString *)subject;
 
-- (void)_resetConnectionDetailsInputInterface;
 - (void)_setNodeIsExpanded:(BOOL)expanded fromNotification:(NSNotification *)notification;
 
 @end
@@ -85,17 +84,15 @@ static NSString *SPDatabaseImage = @"database-small";
 
 		SPTreeNode *node = [self selectedFavoriteNode];
 		
-		if (![node isGroup]) {
-			[self updateFavoriteSelection:self];
-			
+		[self updateFavoriteSelection:self];
+
+		if (![node isGroup]) {			
 			[addToFavoritesButton setEnabled:NO];
-			
+
 			favoriteNameFieldWasTouched = YES;
 		}
 		else {	
 			[addToFavoritesButton setEnabled:YES];
-			
-			[self _resetConnectionDetailsInputInterface];
 		}
 		
 		[connectionResizeContainer setHidden:NO];
@@ -415,6 +412,7 @@ static NSString *SPDatabaseImage = @"database-small";
  */
 - (BOOL)control:(NSControl *)control textShouldEndEditing:(NSText *)fieldEditor
 {
+	
 	// Request a password refresh to keep keychain references in sync with favorites, but only if a favorite
 	// is selected, meaning we're editing an existing one, not a new one.
 	if (((id)control != (id)favoritesOutlineView) && ([self selectedFavoriteNode])) {