Whether error was set or not, if there's no mapping, that's an error.

diff --git a/Classes/NJMappingsController.m b/Classes/NJMappingsController.m
index fa851b15629e23c098b3a1809899f7285a966b5f..c3209ac931a20b365002b88fc96d9494e390c25a 100644 (file)
--- 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

diff --git a/Info.plist b/Info.plist
index 6dba9179cb505474683f1e9d68e7249643840848..b17e62662a4a1ccc53edb6927fbfc9ba0cd554f1 100644 (file)
--- a/Info.plist
+++ b/Info.plist
@@ -46,7 +46,7 @@
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>305</string>
+       <string>306</string>
        <key>LSApplicationCategoryType</key>
        <string>public.app-category.utilities</string>
        <key>NSHumanReadableCopyright</key>