From 1830a824116f569c6e5ab75116b30cbab4309885 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 20 Sep 2015 20:36:17 +0200 Subject: A little experimenting with #2218 --- Source/SPTableContent.m | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index 89a73138..2b185bca 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -407,9 +407,6 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper // Reset table key store for use in argumentForRow: if (keys) SPClear(keys); - // Reset data column store - [dataColumns removeAllObjects]; - // Check the supplied table name. If it matches the old one, a reload is being performed; // reload the data in-place to maintain table state if possible. if ([selectedTable isEqualToString:newTableName]) { @@ -433,6 +430,7 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper [tableContentView deselectAll:self]; // Restore the table content view to the top left + // Note: This may cause the table view to reload it's data! [tableContentView scrollRowToVisible:0]; [tableContentView scrollColumnToVisible:0]; @@ -440,6 +438,9 @@ static NSString *SPTableFilterSetDefaultOperator = @"SPTableFilterSetDefaultOper maxNumRows = [[tableDataInstance statusValueForKey:@"Rows"] integerValue]; maxNumRowsIsEstimate = YES; } + + // Reset data column store + [dataColumns removeAllObjects]; // If no table has been supplied, reset the view to a blank table and disabled elements. if (!newTableName) { -- cgit v1.2.3