X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJMappingsController.m;h=c3209ac931a20b365002b88fc96d9494e390c25a;hp=fa851b15629e23c098b3a1809899f7285a966b5f;hb=58ce8f7f50f382f18e7b416eca737803af284868;hpb=764667945312ea9762fba3127ec175387fa0a930

diff --git a/Classes/NJMappingsController.m b/Classes/NJMappingsController.m
index fa851b1..c3209ac 100644
--- a/Classes/NJMappingsController.m
+++ b/Classes/NJMappingsController.m
@@ -231,7 +231,7 @@
                                                     mappings:_mappings
                                                        error:&error];
     
-    if (mapping && !error) {
+    if (mapping) {
         NJMapping *mergeInto = self[mapping.name];
         if ([mergeInto hasConflictWith:mapping]) {
             NSAlert *conflictAlert = [[NSAlert alloc] init];
@@ -256,9 +256,7 @@
             [self activateMapping:mapping];
             [self mappingsChanged];
         }
-    }
-
-    if (error) {
+    } else {
         [window presentError:error
               modalForWindow:window
                     delegate:nil