Skip to content

Commit dc1adca

Browse files
committed
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.
1 parent 1b09381 commit dc1adca

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

Frameworks/SPMySQLFramework/Source/SPMySQLConnection.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ - (BOOL)_connect
418418

419419
// If a connection is already active in some form, throw an exception
420420
if (state != SPMySQLDisconnected && state != SPMySQLConnectionLostInBackground) {
421-
[NSException raise:NSInternalInconsistencyException format:@"Attempted to connect a connection that is not disconnected (%d).", state];
421+
[NSException raise:NSInternalInconsistencyException format:@"Attempted to connect a connection that is not disconnected (SPMySQLConnectionState=%d).", state];
422422
return NO;
423423
}
424424
state = SPMySQLConnecting;

Source/SPFieldEditorController.m

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -524,9 +524,6 @@ - (IBAction)segmentControllerChanged:(id)sender
524524
[hexTextView setHidden:YES];
525525
[hexTextScrollView setHidden:YES];
526526
[usedSheet makeFirstResponder:editTextView];
527-
#ifndef SP_CODA
528-
[[NSApp mainWindow] makeFirstResponder:editTextView];
529-
#endif
530527
break;
531528
case ImageSegment:
532529
[editTextView setHidden:YES];

0 commit comments

Comments
 (0)