diff options
| author | rowanbeentje <rowan@beent.je> | 2012-11-28 02:09:13 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2012-11-28 02:09:13 +0000 |
| commit | 585598dee1cc9f53e37ff47b5548bd034cdefee4 (patch) | |
| tree | 9143fbb229aec7cc214b88845e0b2ab851209961 /Source/SPConnectionController.m | |
| parent | a45f89fecc9314aab976f0a474d4bfd3358837b9 (diff) | |
| download | sequelpro-585598dee1cc9f53e37ff47b5548bd034cdefee4.tar.gz sequelpro-585598dee1cc9f53e37ff47b5548bd034cdefee4.tar.bz2 sequelpro-585598dee1cc9f53e37ff47b5548bd034cdefee4.zip | |
- Improve connection testing to use edited passwords on a connection with keychain entries
- Clean up connection error handling slightly
Diffstat (limited to 'Source/SPConnectionController.m')
| -rw-r--r-- | Source/SPConnectionController.m | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index 8cb08556..d1d7ba2f 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -1576,12 +1576,15 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, [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]]; + // If not testing a connection,uUpdate the password fields, restoring passwords that may have + // been bulleted out during connection + if (!isTestingConnection) { + if (connectionKeychainItemName) { + [self setPassword:[keychain getPasswordForName:connectionKeychainItemName account:connectionKeychainItemAccount]]; + } + if (connectionSSHKeychainItemName) { + [self setSshPassword:[keychain getPasswordForName:connectionSSHKeychainItemName account:connectionSSHKeychainItemAccount]]; + } } // Re-enable favorites table view |