diff options
| author | stuconnolly <stuart02@gmail.com> | 2012-01-22 12:25:44 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2012-01-22 12:25:44 +0000 |
| commit | 3a0616a9aa060ccf4144a8bbdf65c647432727a4 (patch) | |
| tree | 48b21d604acb31d8696e5d1a8d787bf38dd18d77 | |
| parent | 1d7ed99d602bf9c7aa4ea40a9a2ab6458864e51f (diff) | |
| download | sequelpro-3a0616a9aa060ccf4144a8bbdf65c647432727a4.tar.gz sequelpro-3a0616a9aa060ccf4144a8bbdf65c647432727a4.tar.bz2 sequelpro-3a0616a9aa060ccf4144a8bbdf65c647432727a4.zip | |
Bring outlinew view branch up to date with trunk (r3468:3470).
| -rw-r--r-- | Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m | 2 | ||||
| -rw-r--r-- | Source/SPConnectionController.h | 2 | ||||
| -rw-r--r-- | Source/SPTablesList.m | 3 |
3 files changed, 2 insertions, 5 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 diff --git a/Source/SPConnectionController.h b/Source/SPConnectionController.h index 5a90c985..c7f191a5 100644 --- a/Source/SPConnectionController.h +++ b/Source/SPConnectionController.h @@ -52,7 +52,7 @@ #endif -@interface SPConnectionController : NSObject +@interface SPConnectionController : NSViewController { id <SPConnectionControllerDelegateProtocol, NSObject> delegate; diff --git a/Source/SPTablesList.m b/Source/SPTablesList.m index b66796fa..c587095c 100644 --- a/Source/SPTablesList.m +++ b/Source/SPTablesList.m @@ -24,9 +24,6 @@ // More info at <http://code.google.com/p/sequel-pro/> #import "SPTablesList.h" -#ifndef SP_REFACTOR /* headers */ -#import "SPConnectionController.h" -#endif #import "SPDatabaseDocument.h" #import "SPTableStructure.h" #import "SPDatabaseViewController.h" |