kylefang/MagicalRecord
1
0
Fork 0
mirror of https://github.com/zhigang1992/MagicalRecord.git synced 2026-04-29 20:46:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

If saving a MOC when it's a NSConfinementConcurrencyType, don't use performBlock* on save

Browse Source
This commit is contained in:
Saul Mora
2012-12-18 18:46:45 -07:00
parent 16df3cc0bb
commit 9c35f31a39
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalObserving.m
View File

@@ -11,7 +11,7 @@
#import "MagicalRecord.h"
#import "MagicalRecord+iCloud.h"
static void const * kMagicalRecordNotifiesMainContextAssociatedValueKey = @"kMagicalRecordNotifiesMainContextOnSave";
//static void const * kMagicalRecordNotifiesMainContextAssociatedValueKey = @"kMagicalRecordNotifiesMainContextOnSave";
NSString * const kMagicalRecordDidMergeChangesFromiCloudNotification = @"kMagicalRecordDidMergeChangesFromiCloudNotification";

13
MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m
View File

@@ -53,7 +53,7 @@
MRLog(@"→ Save Parents? %@", @(saveParentContexts));
MRLog(@"→ Save Synchronously? %@", @(syncSave));
id saveBlock = ^{
void (^saveBlock)(void) = ^{
NSError *error = nil;
BOOL saved = NO;
@@ -94,9 +94,16 @@
}
};
if (YES == syncSave) {
if ([self concurrencyType] == NSConfinementConcurrencyType)
{
saveBlock();
}
else if (YES == syncSave)
{
[self performBlockAndWait:saveBlock];
} else {
}
else
{
[self performBlock:saveBlock];
}
}