- When opening the add new sheet, ensure that the remove button is disabled when there is only one indexed field.

- When cancelling adding a new index reset the indexed columns.

1 files changed, 10 insertions, 0 deletions

diff --git a/Source/SPIndexesController.m b/Source/SPIndexesController.m
index 7302a4a5..80e8434c 100644
--- a/Source/SPIndexesController.m
+++ b/Source/SPIndexesController.m
@@ -161,6 +161,9 @@ NSString *SPNewIndexStorageType    = @"IndexStorageType";
 		modalDelegate:self
 	   didEndSelector:@selector(addIndexSheetDidEnd:returnCode:contextInfo:) 
 		  contextInfo:nil];
+	
+	// Because there is only one indexed column initially, disable the remove button
+	[removeIndexedColumnButton setEnabled:NO];
 }
 
 /**
@@ -242,12 +245,19 @@ NSString *SPNewIndexStorageType    = @"IndexStorageType";
 	[indexAdvancedOptionsView setHidden:YES];
 	[indexAdvancedOptionsViewButton setState:NSOffState];
 	
+	// Hide the size column
 	[indexSizeTableColumn setHidden:YES];
+
+	// Reset the indexed columns
+	[indexedFields removeAllObjects];
+	[indexedFields addObject:[[[fields objectAtIndex:0] copy] autorelease]];
 	
 	[self _resizeWindowForAdvancedOptionsViewByHeightDelta:0];
 	
 	[NSApp endSheet:[sender window] returnCode:[sender tag]];
 	[[sender window] orderOut:self];
+	
+	[self _reloadIndexedColumnsTableData];
 }
 
 /**