Merge pull request #799 from maximmalygin/release/3.0

Fix data import of ordered relationships
magicalpanda · Jan 21, 2016 · f3dc859 · f3dc859
2 parents 6c2ac62 + 1a6dfab
commit f3dc859
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Library/Categories/CoreData/NSManagedObject/NSManagedObject+MagicalDataImport.m b/Library/Categories/CoreData/NSManagedObject/NSManagedObject+MagicalDataImport.m
@@ -93,7 +93,10 @@ - (void)MR_setObject:(NSManagedObject *)relatedObject forRelationship:(NSRelatio
             NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[self methodSignatureForSelector:selector]];
             [invocation setSelector:selector];
             [invocation invokeWithTarget:self];
-            [invocation getReturnValue:&relationshipSource];
+
+            __unsafe_unretained id orderedSet;
+            [invocation getReturnValue:&orderedSet];
+            relationshipSource = orderedSet;
 
             addRelationMessageFormat = @"addObject:";
         }
@@ -108,7 +111,7 @@ - (void)MR_setObject:(NSManagedObject *)relatedObject forRelationship:(NSRelatio
 
     @try
     {
-        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[self methodSignatureForSelector:selector]];
+        NSInvocation *invocation = [NSInvocation invocationWithMethodSignature:[relationshipSource methodSignatureForSelector:selector]];
         [invocation setSelector:selector];
         [invocation setArgument:&relatedObject atIndex:2];
         [invocation invokeWithTarget:relationshipSource];