Properly removing existing on-save notificaitons before replacing the…

… default or root contexts
magicalpanda · Oct 9, 2012 · 343b027 · 343b027
1 parent 31b2e54
commit 343b027
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalRecord.m b/MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalRecord.m
@@ -52,6 +52,11 @@ + (NSManagedObjectContext *) MR_defaultContext
 
 + (void) MR_setDefaultContext:(NSManagedObjectContext *)moc
 {
+    if (defaultManagedObjectContext_)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:defaultManagedObjectContext_];
+    }
+
     NSPersistentStoreCoordinator *coordinator = [NSPersistentStoreCoordinator MR_defaultStoreCoordinator];
     if (iCloudSetupNotificationObserver) {
         [[NSNotificationCenter defaultCenter] removeObserver:iCloudSetupNotificationObserver];
@@ -88,6 +93,11 @@ + (NSManagedObjectContext *) MR_rootSavingContext;
 
 + (void) MR_setRootSavingContext:(NSManagedObjectContext *)context;
 {
+    if (rootSavingContext)
+    {
+        [[NSNotificationCenter defaultCenter] removeObserver:rootSavingContext];
+    }
+
     rootSavingContext = context;
     [context MR_obtainPermanentIDsBeforeSaving];
     [rootSavingContext setMergePolicy:NSMergeByPropertyObjectTrumpMergePolicy];
@@ -174,8 +184,10 @@ - (void)contextWillSave:(NSNotification *)notification
         NSArray *insertedObjects = [[context insertedObjects] allObjects];
         MRLog(@"Context %@ is about to save. Obtaining permanent IDs for new %lu inserted objects", [context MR_description], (unsigned long)[insertedObjects count]);
         NSError *error = nil;
-        [context obtainPermanentIDsForObjects:insertedObjects error:&error];
-        [MagicalRecord handleErrors:error];
+        BOOL success = [context obtainPermanentIDsForObjects:insertedObjects error:&error];
+        if (!success && error) {
+            [MagicalRecord handleErrors:error];
+        }
     }
 }