diff options
| author | Max <post@wickenrode.com> | 2015-07-12 02:27:07 +0200 |
|---|---|---|
| committer | Max <post@wickenrode.com> | 2015-07-12 22:29:00 +0200 |
| commit | 4002f28ba489690a2e2e694779785e035370bbfb (patch) | |
| tree | 1b564befdcb71888614b44f2ca752c90e7c059fa | |
| parent | 1d857c30e20edc2779f1e1af825257ab982bb271 (diff) | |
| download | sequelpro-4002f28ba489690a2e2e694779785e035370bbfb.tar.gz sequelpro-4002f28ba489690a2e2e694779785e035370bbfb.tar.bz2 sequelpro-4002f28ba489690a2e2e694779785e035370bbfb.zip | |
Fix an issue on 10.7+ introduced in ce33534
This removes a IMHO useless makeFirstResponder: call. In all cases where [NSApp mainWindow] == usedSheet (< 10.7) the call right above it would already handle it. On the other hand if [NSApp mainWindow] != usedSheet (10.7+) the call would fail anyways because in that case editTextView is not even a subview of the main window.
| -rw-r--r-- | Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m | 2 | ||||
| -rw-r--r-- | Source/SPFieldEditorController.m | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m index 9fa5a9c8..c12312a2 100644 --- a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m +++ b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m @@ -418,7 +418,7 @@ const char *SPMySQLSSLPermissibleCiphers = "DHE-RSA-AES256-SHA:AES256-SHA:DHE-RS // If a connection is already active in some form, throw an exception if (state != SPMySQLDisconnected && state != SPMySQLConnectionLostInBackground) { - [NSException raise:NSInternalInconsistencyException format:@"Attempted to connect a connection that is not disconnected (%d).", state]; + [NSException raise:NSInternalInconsistencyException format:@"Attempted to connect a connection that is not disconnected (SPMySQLConnectionState=%d).", state]; return NO; } state = SPMySQLConnecting; diff --git a/Source/SPFieldEditorController.m b/Source/SPFieldEditorController.m index fe9359da..8c5c72ae 100644 --- a/Source/SPFieldEditorController.m +++ b/Source/SPFieldEditorController.m @@ -524,9 +524,6 @@ typedef enum { [hexTextView setHidden:YES]; [hexTextScrollView setHidden:YES]; [usedSheet makeFirstResponder:editTextView]; -#ifndef SP_CODA - [[NSApp mainWindow] makeFirstResponder:editTextView]; -#endif break; case ImageSegment: [editTextView setHidden:YES]; |