X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJMappingsController.m;h=4a9c3fffaba6ccc82c42fde5cf827bbd10a65b00;hp=500e90150ed1277b30145530e4272f9fd496488f;hb=47a530c22a3f277d11e7ddb4b0147c8f93f6f9cd;hpb=235c087385a6e959ba7edefe4a3cbbbc00b2a534

diff --git a/Classes/NJMappingsController.m b/Classes/NJMappingsController.m
index 500e901..4a9c3ff 100644
--- a/Classes/NJMappingsController.m
+++ b/Classes/NJMappingsController.m
@@ -116,6 +116,7 @@
 }
 
 - (IBAction)addPressed:(id)sender {
+    [self mappingPressed:sender];
     NJMapping *newMapping = [[NJMapping alloc] init];
     [_mappings addObject:newMapping];
     [self activateMapping:newMapping];
@@ -246,6 +247,10 @@
                                      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];