From: Joe Wreschnig <joe.wreschnig@gmail.com>
Date: Wed, 13 Mar 2013 11:34:10 +0000 (+0100)
Subject: Fix duplicate entries when merges don't conflict.
X-Git-Tag: version-1.1~37
X-Git-Url: https://git.yukkurigames.com/?a=commitdiff_plain;h=47a530c22a3f277d11e7ddb4b0147c8f93f6f9cd;p=enjoyable.git

Fix duplicate entries when merges don't conflict.
---

diff --git a/Classes/NJMappingsController.m b/Classes/NJMappingsController.m
index 772b14a..4a9c3ff 100644
--- 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 })];
+        } else if (mergeInto) {
+            [mergeInto mergeEntriesFrom:mapping];
+            [self activateMapping:mergeInto];
+            [self mappingsChanged];
         } else {
             [_mappings addObject:mapping];
             [self activateMapping:mapping];
diff --git a/Info.plist b/Info.plist
index 2aada49..04d4b4b 100644
--- a/Info.plist
+++ b/Info.plist
@@ -46,7 +46,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>226</string>
+	<string>228</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>NSHumanReadableCopyright</key>