Bring outline view branch up to date with trunk (r3188:r3201).

1 files changed, 4 insertions, 3 deletions

diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m
index b2859010..c43df1cd 100644
--- a/Source/SPCustomQuery.m
+++ b/Source/SPCustomQuery.m
@@ -882,12 +882,13 @@
 	[resultData removeAllRows];
 	pthread_mutex_unlock(&resultDataLock);
 
+	// Set the column count on the data store before setting up anything else -
+	// ensures that SPDataStorage is set up for timer-driven data loads
+	[resultData setColumnCount:[theResult numOfFields]];
+
 	// Set up the table updates timer
 	[[self onMainThread] initQueryLoadTimer];
 
-	// Set the column count on the data store
-	[resultData setColumnCount:[theResult numOfFields]];
-
 	// Set up an autorelease pool for row processing
 	dataLoadingPool = [[NSAutoreleasePool alloc] init];