aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPConnectionHandler.m
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2011-02-20 13:06:06 +0000
committerstuconnolly <stuart02@gmail.com>2011-02-20 13:06:06 +0000
commitbea72ac3bbebb9e35e34b840968b4ba0f433e87a (patch)
treea285cfc5ced8eca11849980b9064ec274703a231 /Source/SPConnectionHandler.m
parent2e31a4ad75b8e47a4feacadd567fbfab65eeede9 (diff)
downloadsequelpro-bea72ac3bbebb9e35e34b840968b4ba0f433e87a.tar.gz
sequelpro-bea72ac3bbebb9e35e34b840968b4ba0f433e87a.tar.bz2
sequelpro-bea72ac3bbebb9e35e34b840968b4ba0f433e87a.zip
Bring outline view branch up to date with trunk (r3188:r3201).
Diffstat (limited to 'Source/SPConnectionHandler.m')
-rw-r--r--Source/SPConnectionHandler.m7
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/SPConnectionHandler.m b/Source/SPConnectionHandler.m
index adf21ffa..e66580a9 100644
--- a/Source/SPConnectionHandler.m
+++ b/Source/SPConnectionHandler.m
@@ -282,6 +282,13 @@ certificateAuthorityCertificatePath:[self sslCACertFileLocationEnabled] ? [self
NSInteger newState = [theTunnel state];
+ // If the user cancelled the password prompt dialog
+ if ([theTunnel passwordPromptCancelled]) {
+ [self _restoreConnectionInterface];
+
+ return;
+ }
+
if (newState == PROXY_STATE_IDLE) {
[dbDocument setTitlebarStatus:NSLocalizedString(@"SSH Disconnected", @"SSH disconnected titlebar marker")];