aboutsummaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBibiko <bibiko@eva.mpg.de>2011-01-19 12:35:17 +0000
committerBibiko <bibiko@eva.mpg.de>2011-01-19 12:35:17 +0000
commit6e2a43045f6f98c4fabf5a3358c2bdfdda2d6688 (patch)
treeb31cff90e22cb9e0a9d5f4adee0d45cdd4ede273 /Source
parent3f813a65b0d41b4a1771349f27a2d0ccafb740f5 (diff)
downloadsequelpro-6e2a43045f6f98c4fabf5a3358c2bdfdda2d6688.tar.gz
sequelpro-6e2a43045f6f98c4fabf5a3358c2bdfdda2d6688.tar.bz2
sequelpro-6e2a43045f6f98c4fabf5a3358c2bdfdda2d6688.zip
• fixed issue while updating Default Bundles for key equivalent
• improved JSON Bundle commands - got rid of trailing whitespaces inside data and as JSON object - added error handling for serialization a JSON object to suppress inserting of "null"
Diffstat (limited to 'Source')
-rw-r--r--Source/SPAppController.m3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/SPAppController.m b/Source/SPAppController.m
index a0e47137..a38dc631 100644
--- a/Source/SPAppController.m
+++ b/Source/SPAppController.m
@@ -1754,7 +1754,8 @@ YY_BUFFER_STATE yy_scan_string (const char *);
if(![[bundleKeyEquivalents objectForKey:scope] objectForKey:[cmdData objectForKey:SPBundleFileKeyEquivalentKey]])
[[bundleKeyEquivalents objectForKey:scope] setObject:[NSMutableArray array] forKey:[cmdData objectForKey:SPBundleFileKeyEquivalentKey]];
- [[[bundleKeyEquivalents objectForKey:scope] objectForKey:[cmdData objectForKey:SPBundleFileKeyEquivalentKey]] addObject:
+ if(!doBundleUpdate || (doBundleUpdate && (![[cmdData objectForKey:SPBundleFileIsDefaultBundleKey] boolValue] || processDefaultBundles)))
+ [[[bundleKeyEquivalents objectForKey:scope] objectForKey:[cmdData objectForKey:SPBundleFileKeyEquivalentKey]] addObject:
[NSDictionary dictionaryWithObjectsAndKeys:
infoPath, @"path",
[cmdData objectForKey:SPBundleFileNameKey], @"title",