diff options
| author | rowanbeentje <rowan@beent.je> | 2012-10-14 19:22:45 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2012-10-14 19:22:45 +0000 |
| commit | d8896ae0a22b0014d0b43706280c8a390f14b058 (patch) | |
| tree | 7ffd10862c22a37507bd7d10edae26d015fd5620 /Source/SPConnectionHandler.m | |
| parent | dc45c654aab99cbccecda192396dc8baefd5690e (diff) | |
| download | sequelpro-d8896ae0a22b0014d0b43706280c8a390f14b058.tar.gz sequelpro-d8896ae0a22b0014d0b43706280c8a390f14b058.tar.bz2 sequelpro-d8896ae0a22b0014d0b43706280c8a390f14b058.zip | |
- Clean up some connection cancellation/close-during-connect edges as a result of r3894, attempting to improve some exceptions during aborted connections
- Name threads created in SPMySQL.framework
Diffstat (limited to 'Source/SPConnectionHandler.m')
| -rw-r--r-- | Source/SPConnectionHandler.m | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/SPConnectionHandler.m b/Source/SPConnectionHandler.m index 3495eb95..6efdf366 100644 --- a/Source/SPConnectionHandler.m +++ b/Source/SPConnectionHandler.m @@ -291,8 +291,10 @@ static NSString *SPLocalhostAddress = @"127.0.0.1"; isConnecting = NO; // If the user is only testing the connection, kill the connection - // once established and reset the UI. - if (isTestingConnection) { + // once established and reset the UI. Also catch connection cancels. + if (isTestingConnection || cancellingConnection) { + + // Clean up any connections remaining, and reset the UI [self cancelConnection:self]; if (isTestingConnection) { |