aboutsummaryrefslogtreecommitdiffstats
path: root/Frameworks/MCPKit/MCPFoundationKit
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2012-01-22 12:25:44 +0000
committerstuconnolly <stuart02@gmail.com>2012-01-22 12:25:44 +0000
commit3a0616a9aa060ccf4144a8bbdf65c647432727a4 (patch)
tree48b21d604acb31d8696e5d1a8d787bf38dd18d77 /Frameworks/MCPKit/MCPFoundationKit
parent1d7ed99d602bf9c7aa4ea40a9a2ab6458864e51f (diff)
downloadsequelpro-3a0616a9aa060ccf4144a8bbdf65c647432727a4.tar.gz
sequelpro-3a0616a9aa060ccf4144a8bbdf65c647432727a4.tar.bz2
sequelpro-3a0616a9aa060ccf4144a8bbdf65c647432727a4.zip
Bring outlinew view branch up to date with trunk (r3468:3470).
Diffstat (limited to 'Frameworks/MCPKit/MCPFoundationKit')
-rw-r--r--Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m2
1 files changed, 1 insertions, 1 deletions
diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
index 2c4f424d..04dcf50d 100644
--- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
+++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
@@ -3255,7 +3255,7 @@ void pingThreadCleanup(void *pingDetails)
delegate = nil;
// Ensure the query lock is unlocked, thereafter setting to nil in case of pending calls
- [self unlockConnection];
+ if ([connectionLock condition] != MCPConnectionIdle) [self unlockConnection];
[connectionLock release], connectionLock = nil;
// Clean up connections if necessary