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.
sequelpro · Jul 12, 2015 · dc1adca · dc1adca
1 parent 1b09381
commit dc1adca
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m
@@ -418,7 +418,7 @@ - (BOOL)_connect
 
 	// 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
@@ -524,9 +524,6 @@ - (IBAction)segmentControllerChanged:(id)sender
 			[hexTextView setHidden:YES];
 			[hexTextScrollView setHidden:YES];
 			[usedSheet makeFirstResponder:editTextView];
-#ifndef SP_CODA
-			[[NSApp mainWindow] makeFirstResponder:editTextView];
-#endif
 			break;
 		case ImageSegment:
 			[editTextView setHidden:YES];