projects
/
enjoyable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix duplicate entries when merges don't conflict.
[enjoyable.git]
/
Classes
/
NJMappingsController.m
diff --git
a/Classes/NJMappingsController.m
b/Classes/NJMappingsController.m
index
772b14a
..
4a9c3ff
100644
(file)
--- a/
Classes/NJMappingsController.m
+++ b/
Classes/NJMappingsController.m
@@
-247,6
+247,10
@@
didEndSelector:@selector(mappingConflictDidResolve:returnCode:contextInfo:)
contextInfo:(void *)CFBridgingRetain(@{ @"old mapping": mergeInto,
@"new mapping": mapping })];
didEndSelector:@selector(mappingConflictDidResolve:returnCode:contextInfo:)
contextInfo:(void *)CFBridgingRetain(@{ @"old mapping": mergeInto,
@"new mapping": mapping })];
+ } else if (mergeInto) {
+ [mergeInto mergeEntriesFrom:mapping];
+ [self activateMapping:mergeInto];
+ [self mappingsChanged];
} else {
[_mappings addObject:mapping];
[self activateMapping:mapping];
} else {
[_mappings addObject:mapping];
[self activateMapping:mapping];