- When the connection interface is restored as a result of a connection attempt cancellation or failure, restore the passwords from their bulleted-out state. This addresses Issue #1497.

1 files changed, 9 insertions, 1 deletions

diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m
index a8c9da8d..8cb08556 100644
--- a/Source/SPConnectionController.m
+++ b/Source/SPConnectionController.m
@@ -1575,7 +1575,15 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2,
 	[progressIndicator display];
 	[progressIndicatorText setHidden:YES];
 	[progressIndicatorText display];
-	
+
+	// Update the password fields, restoring passwords that may have been bulletted out during connection
+	if (connectionKeychainItemName) {
+		[self setPassword:[keychain getPasswordForName:connectionKeychainItemName account:connectionKeychainItemAccount]];
+	}
+	if (connectionSSHKeychainItemName) {
+		[self setSshPassword:[keychain getPasswordForName:connectionSSHKeychainItemName account:connectionSSHKeychainItemAccount]];
+	}
+
 	// Re-enable favorites table view
 	[favoritesOutlineView setEnabled:YES];
 	[(NSView *)favoritesOutlineView display];