Merge pull request acoomans#3 from acoomans/fix-duplicated_identifier…

…_crash Fix duplicated identifier crash
loveforgeter · Mar 11, 2014 · 2e0cd38 · 2e0cd38
2 parents a72ffa5 + 1e136bf
commit 2e0cd38
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/ACCodeSnippetRepository/Classes/DataStores/ACCodeSnippetGitDataStore.m b/ACCodeSnippetRepository/Classes/DataStores/ACCodeSnippetGitDataStore.m
@@ -266,8 +266,13 @@ - (void)updateSnippetsForFilesInLocalRepository:(NSArray*)array {
             __block IDECodeSnippet *snippet = [[NSClassFromString(@"IDECodeSnippet") alloc] initWithDictionaryRepresentation:dict];
 
             dispatch_async(dispatch_get_main_queue(), ^{
-                [[NSClassFromString(@"IDECodeSnippetRepository") sharedRepository] override_saveUserCodeSnippetToDisk:snippet];
-                [[NSClassFromString(@"IDECodeSnippetRepository") sharedRepository] addCodeSnippet:snippet];
+
+                IDECodeSnippetRepository *repository = [NSClassFromString(@"IDECodeSnippetRepository") sharedRepository];
+                [repository override_saveUserCodeSnippetToDisk:snippet];
+
+                if (![repository codeSnippetForIdentifier:snippet.identifier]) {
+                    [repository addCodeSnippet:snippet];
+                }
 
                 NSData *data = [ACCodeSnippetSerialization dataWithDictionary:dict
                                                                        format:0

diff --git a/ACCodeSnippetRepository/IDE/Swizzle/IDECodeSnippetRepositorySwizzler.h b/ACCodeSnippetRepository/IDE/Swizzle/IDECodeSnippetRepositorySwizzler.h
@@ -17,7 +17,6 @@
 - (void)removeDataStore:(id<ACCodeSnippetDataStoreProtocol>)dataStore;
 
 - (void)addCodeSnippet:(id)arg1;
-- (void)override_addCodeSnippet:(id)arg1;
 - (void)removeCodeSnippet:(id)arg1;
 
 - (IDECodeSnippet*)codeSnippetForIdentifier:(NSString*)identifier;