From 3c2d200a38d80ad6fe86c34766c868abdf41bea9 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Thu, 9 May 2013 18:25:40 +0000 Subject: - Fix hangs when adding columns to large tables after the table has beeen viewed already, addressing Issue #1710 --- Resources/English.lproj/Localizable.strings | Bin 243790 -> 245200 bytes Source/SPCopyTable.m | 6 +++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings index ff2331f5..5a55a427 100644 Binary files a/Resources/English.lproj/Localizable.strings and b/Resources/English.lproj/Localizable.strings differ diff --git a/Source/SPCopyTable.m b/Source/SPCopyTable.m index 02ff29ec..1b414170 100644 --- a/Source/SPCopyTable.m +++ b/Source/SPCopyTable.m @@ -803,8 +803,12 @@ static const NSInteger kBlobAsImageFile = 4; // Retrieve the cell's content contentString = [tableStorage cellDataAtRow:i column:columnIndex]; + // If the cell hasn't loaded yet, skip processing + if (!contentString) + continue; + // Get WKT string out of the SPMySQLGeometryData for calculation - if ([contentString isKindOfClass:spmysqlGeometryData]) + else if ([contentString isKindOfClass:spmysqlGeometryData]) contentString = [contentString wktString]; // Replace NULLs with their placeholder string -- cgit v1.2.3