diff options
| author | stuconnolly <stuart02@gmail.com> | 2011-02-20 13:06:06 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2011-02-20 13:06:06 +0000 |
| commit | bea72ac3bbebb9e35e34b840968b4ba0f433e87a (patch) | |
| tree | a285cfc5ced8eca11849980b9064ec274703a231 /Source/SPTableStructureDelegate.m | |
| parent | 2e31a4ad75b8e47a4feacadd567fbfab65eeede9 (diff) | |
| download | sequelpro-bea72ac3bbebb9e35e34b840968b4ba0f433e87a.tar.gz sequelpro-bea72ac3bbebb9e35e34b840968b4ba0f433e87a.tar.bz2 sequelpro-bea72ac3bbebb9e35e34b840968b4ba0f433e87a.zip | |
Bring outline view branch up to date with trunk (r3188:r3201).
Diffstat (limited to 'Source/SPTableStructureDelegate.m')
| -rw-r--r-- | Source/SPTableStructureDelegate.m | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/SPTableStructureDelegate.m b/Source/SPTableStructureDelegate.m index 17ad817d..729091d6 100644 --- a/Source/SPTableStructureDelegate.m +++ b/Source/SPTableStructureDelegate.m @@ -49,7 +49,10 @@ NSInteger end = [enc length] - start - 1; collations = [databaseDataInstance getDatabaseCollationsForEncoding:[enc substringWithRange:NSMakeRange(start, end)]]; } else { - if([tableDataInstance tableEncoding] != nil) { + + // If the structure has loaded (not still loading!) and the table encoding + // is set, use the appropriate collations. + if([tableDocumentInstance structureLoaded] && [tableDataInstance tableEncoding] != nil) { collations = [databaseDataInstance getDatabaseCollationsForEncoding:[tableDataInstance tableEncoding]]; } else { collations = [NSArray array]; |