diff options
author | rowanbeentje <rowan@beent.je> | 2013-05-09 18:25:40 +0000 |
---|---|---|
committer | rowanbeentje <rowan@beent.je> | 2013-05-09 18:25:40 +0000 |
commit | 3c2d200a38d80ad6fe86c34766c868abdf41bea9 (patch) | |
tree | bc47af728eef06108fcc605ed9a0ed7e48e1231c | |
parent | 0075a9074cc88a724da80b9bc2621674ac79b006 (diff) | |
download | sequelpro-3c2d200a38d80ad6fe86c34766c868abdf41bea9.tar.gz sequelpro-3c2d200a38d80ad6fe86c34766c868abdf41bea9.tar.bz2 sequelpro-3c2d200a38d80ad6fe86c34766c868abdf41bea9.zip |
- Fix hangs when adding columns to large tables after the table has beeen viewed already, addressing Issue #1710
-rw-r--r-- | Resources/English.lproj/Localizable.strings | bin | 243790 -> 245200 bytes | |||
-rw-r--r-- | Source/SPCopyTable.m | 6 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings Binary files differindex ff2331f5..5a55a427 100644 --- a/Resources/English.lproj/Localizable.strings +++ b/Resources/English.lproj/Localizable.strings 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 |