From: Joe Wreschnig <joe.wreschnig@gmail.com>
Date: Fri, 15 Mar 2013 22:45:27 +0000 (+0100)
Subject: Whether error was set or not, if there's no mapping, that's an error.
X-Git-Tag: version-1.1~22
X-Git-Url: https://git.yukkurigames.com/?a=commitdiff_plain;h=5c56b988cdf5079dd5f3f256012e0d0a384f96f7;p=enjoyable.git

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 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
diff --git a/Info.plist b/Info.plist
index 6dba917..b17e626 100644
--- 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>