diff options
| author | stuconnolly <stuart02@gmail.com> | 2012-01-22 12:19:21 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2012-01-22 12:19:21 +0000 |
| commit | 1d7ed99d602bf9c7aa4ea40a9a2ab6458864e51f (patch) | |
| tree | 6c08ad29618ea02caf302180706d010c90cd57e0 /Source/SPSSHTunnel.m | |
| parent | e23ba5155a53c43a106ac9646f51321ccc7d86f4 (diff) | |
| download | sequelpro-1d7ed99d602bf9c7aa4ea40a9a2ab6458864e51f.tar.gz sequelpro-1d7ed99d602bf9c7aa4ea40a9a2ab6458864e51f.tar.bz2 sequelpro-1d7ed99d602bf9c7aa4ea40a9a2ab6458864e51f.zip | |
Bring outlinew view branch up to date with trunk (r3375:3468).
Diffstat (limited to 'Source/SPSSHTunnel.m')
| -rw-r--r-- | Source/SPSSHTunnel.m | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/SPSSHTunnel.m b/Source/SPSSHTunnel.m index d0464d59..0c25c181 100644 --- a/Source/SPSSHTunnel.m +++ b/Source/SPSSHTunnel.m @@ -431,7 +431,9 @@ [debugMessages addObject:[NSString stringWithString:message]]; [debugMessagesLock unlock]; - if ([message rangeOfString:@"Entering interactive session."].location != NSNotFound) { + if ([message rangeOfString:@"Entering interactive session."].location != NSNotFound + || [message rangeOfString:@"mux_client_request_session: master session id: "].location != NSNotFound) + { connectionState = PROXY_STATE_CONNECTED; if (delegate) [delegate performSelectorOnMainThread:stateChangeSelector withObject:self waitUntilDone:NO]; } @@ -644,7 +646,7 @@ if (requestedResponse) { NSString *thePassword = [NSString stringWithString:[sshPasswordField stringValue]]; [sshPasswordField setStringValue:@""]; - if ([delegate respondsToSelector:@selector(setUndoManager:)] && [delegate undoManager]) { + if ([delegate respondsToSelector:@selector(undoManager)] && [delegate undoManager]) { [[delegate undoManager] removeAllActionsWithTarget:sshPasswordField]; } else if ([[parentWindow windowController] document] && [[[parentWindow windowController] document] undoManager]) { [[[[parentWindow windowController] document] undoManager] removeAllActionsWithTarget:sshPasswordField]; |