From 552d01b14d97cdd325ed433bca2945c9a13061b3 Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Sat, 2 Mar 2013 19:07:11 +0000 Subject: - Alter the database creation sheet to correctly use the selected new database encoding - Clean up the database creation logic and remove redundant selection logic - Correctly reset and detect the database encoding when creating and switching databases --- Source/SPDatabaseData.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Source/SPDatabaseData.m') diff --git a/Source/SPDatabaseData.m b/Source/SPDatabaseData.m index 6bf72d5e..202f56ce 100644 --- a/Source/SPDatabaseData.m +++ b/Source/SPDatabaseData.m @@ -79,7 +79,9 @@ NSInteger _sortStorageEngineEntry(NSDictionary *itemOne, NSDictionary *itemTwo, */ - (void)resetAllData { - if (characterSetEncoding != nil) [characterSetEncoding release], characterSetEncoding = nil; + if (characterSetEncoding != nil) [characterSetEncoding release], characterSetEncoding = nil; + if (defaultCollation != nil) [defaultCollation release], defaultCollation = nil; + if (defaultCharacterSetEncoding != nil) [defaultCharacterSetEncoding release], defaultCharacterSetEncoding = nil; [collations removeAllObjects]; [characterSetCollations removeAllObjects]; -- cgit v1.2.3