1 files changed, 13 insertions, 20 deletions

diff --git a/Source/SPTableContentDelegate.m b/Source/SPTableContentDelegate.m
index d2e7f2d5..8f228aa0 100644
--- a/Source/SPTableContentDelegate.m
+++ b/Source/SPTableContentDelegate.m
@@ -464,9 +464,18 @@
 			
 			if (![cell respondsToSelector:@selector(setTextColor:)]) return;
 			
-			id theValue = nil;
+			BOOL showCellAsGray = NO;
 			NSUInteger columnIndex = [[tableColumn identifier] integerValue];
 			
+			// If user wants to edit 'cell' set text color to black and return to avoid
+			// writing in gray if value was NULL
+			if ([tableView editedColumn] != -1
+				&& [tableView editedRow] == rowIndex
+				&& (NSUInteger)[[NSArrayObjectAtIndex([tableView tableColumns], [tableView editedColumn]) identifier] integerValue] == columnIndex) {
+				[cell setTextColor:blackColor];
+				return;
+			}
+
 			// While the table is being loaded, additional validation is required - data
 			// locks must be used to avoid crashes, and indexes higher than the available
 			// rows or columns may be requested.  Use gray to indicate loading in these cases.
@@ -474,34 +483,18 @@
 				pthread_mutex_lock(&tableValuesLock);
 				
 				if (rowIndex < (NSInteger)tableRowsCount && columnIndex < [tableValues columnCount]) {
-					theValue = SPDataStorageObjectAtRowAndColumn(tableValues, rowIndex, columnIndex);
+					showCellAsGray = [tableValues cellIsNullOrUnloadedAtRow:rowIndex column:columnIndex];
 				}
 				
 				pthread_mutex_unlock(&tableValuesLock);
-				
-				if (!theValue) {
-					[cell setTextColor:[NSColor lightGrayColor]];
-					return;
-				}
 			} 
 			else {
-				theValue = SPDataStorageObjectAtRowAndColumn(tableValues, rowIndex, columnIndex);
+				showCellAsGray = [tableValues cellIsNullOrUnloadedAtRow:rowIndex column:columnIndex];
 			}
 			
-			// If user wants to edit 'cell' set text color to black and return to avoid
-			// writing in gray if value was NULL
-			if ([tableView editedColumn] != -1
-				&& [tableView editedRow] == rowIndex
-				&& (NSUInteger)[[NSArrayObjectAtIndex([tableView tableColumns], [tableView editedColumn]) identifier] integerValue] == columnIndex) {
-				[cell setTextColor:blackColor];
-				return;
-			}
 			
-			// For null cells and not loaded cells, display the contents in gray.
-			if ([theValue isNSNull] || [theValue isSPNotLoaded]) {
+			if (showCellAsGray) {
 				[cell setTextColor:lightGrayColor];
-				
-				// Otherwise, set the color to black - required as NSTableView reuses NSCells.
 			} 
 			else {
 				[cell setTextColor:blackColor];