From 0666722f6dda0b076546968d5ab6f554e49a368c Mon Sep 17 00:00:00 2001 From: Rob McBroom Date: Mon, 18 Feb 2013 08:57:15 -0500 Subject: [PATCH] merge recent and iCloud documents correctly It was mixing file paths with QSObjects. Now it combines two arrays of QSObjects. fixes #1396 --- Quicksilver/Code-QuickStepCore/QSObject_FileHandling.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Quicksilver/Code-QuickStepCore/QSObject_FileHandling.m b/Quicksilver/Code-QuickStepCore/QSObject_FileHandling.m index 4ad265a10..d825bf34c 100644 --- a/Quicksilver/Code-QuickStepCore/QSObject_FileHandling.m +++ b/Quicksilver/Code-QuickStepCore/QSObject_FileHandling.m @@ -449,7 +449,7 @@ - (BOOL)loadChildrenForObject:(QSObject *)object { NSIndexSet *ind = [iCloudDocuments indexesOfObjectsWithOptions:NSEnumerationConcurrent passingTest:^BOOL(QSObject *icdoc, NSUInteger i, BOOL *stop) { return ![recentDocuments containsObject:[icdoc objectForType:QSFilePathType]]; }]; - newChildren = [QSObject fileObjectsWithPathArray:[recentDocuments arrayByAddingObjectsFromArray:[iCloudDocuments objectsAtIndexes:ind]]]; + newChildren = [[QSObject fileObjectsWithPathArray:recentDocuments] arrayByAddingObjectsFromArray:[iCloudDocuments objectsAtIndexes:ind]]; for(QSObject * child in newChildren) { [child setObject:bundleIdentifier forMeta:@"QSPreferredApplication"];