Merge remote-tracking branch 'sequelpro/master'

1 files changed, 6 insertions, 15 deletions

diff --git a/Source/SPContentFilterManager.m b/Source/SPContentFilterManager.m
index fe20bcf1..5dc0c48b 100644
--- a/Source/SPContentFilterManager.m
+++ b/Source/SPContentFilterManager.m
@@ -237,7 +237,7 @@ static NSString *SPExportFilterAction = @"SPExportFilter";
 	NSUInteger insertIndex;
 
 	// Store pending changes in Clause
-	[[self window] makeFirstResponder:contentFilterNameTextField];
+	[[self window] makeFirstResponder:nil];
 
 	// Duplicate a selected filter if sender == self
 	if(sender == self)
@@ -298,7 +298,7 @@ static NSString *SPExportFilterAction = @"SPExportFilter";
 {
 
 	// Complete editing in the window
-	[[sender window] makeFirstResponder:[sender window]];
+	[[self window] makeFirstResponder:nil];
 
 	NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Remove selected content filters?", @"remove selected content filters message")
 									 defaultButton:NSLocalizedString(@"Remove", @"remove button")
@@ -609,11 +609,9 @@ static NSString *SPExportFilterAction = @"SPExportFilter";
 
 	// TODO: still rely on a NSArray but in the future rewrite it to use the NSIndexSet directly
 	NSMutableArray *draggedRows = [[NSMutableArray alloc] initWithCapacity:1];
-	NSUInteger rowIndex = [draggedIndexes firstIndex];
-	while ( rowIndex != NSNotFound ) {
+	[draggedIndexes enumerateIndexesUsingBlock:^(NSUInteger rowIndex, BOOL * _Nonnull stop) {
 		[draggedRows addObject:[NSNumber numberWithInteger:rowIndex]];
-		rowIndex = [draggedIndexes indexGreaterThanIndex: rowIndex];
-	}
+	}];
 
 
 	NSInteger destinationRow = row;
@@ -805,16 +803,9 @@ static NSString *SPExportFilterAction = @"SPExportFilter";
 		if (returnCode == NSAlertDefaultReturn) {
 			NSIndexSet *indexes = [contentFilterTableView selectedRowIndexes];
 
-			// Get last index
-			NSUInteger currentIndex = [indexes lastIndex];
-
-			while (currentIndex != NSNotFound) 
-			{
+			[indexes enumerateIndexesWithOptions:NSEnumerationReverse usingBlock:^(NSUInteger currentIndex, BOOL * _Nonnull stop) {
 				[contentFilters removeObjectAtIndex:currentIndex];
-				
-				// Get next index (beginning from the end)
-				currentIndex = [indexes indexLessThanIndex:currentIndex];
-			}
+			}];
 
 			if ([contentFilters count] == 2) {
 				[contentFilterNameTextField setStringValue:@""];