From 144062347c01d72e4792b1b8aee1f687eb793a4a Mon Sep 17 00:00:00 2001
From: Saul Mora <saul@magicalpanda.com>
Date: Sun, 25 Nov 2012 23:31:19 -0700
Subject: [PATCH] Minor formatting updates

---
 .../NSManagedObjectContext+MagicalRecord.m        |  6 +++---
 .../NSManagedObjectContext+MagicalSaves.m         | 15 +++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalRecord.m b/MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalRecord.m
index dd49065..12741e9 100644
--- a/MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalRecord.m
+++ b/MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalRecord.m
@@ -42,7 +42,7 @@ static NSString * const kMagicalRecordNSManagedObjectContextWorkingName = @"kNSM
 
 - (NSString *) MR_parentChain;
 {
-    NSMutableString *familyTree = [@"" mutableCopy];
+    NSMutableString *familyTree = [@"\n" mutableCopy];
     NSManagedObjectContext *currentContext = self;
     do
     {
@@ -131,7 +131,7 @@ static NSString * const kMagicalRecordNSManagedObjectContextWorkingName = @"kNSM
         NSManagedObjectContext *defaultContext = [self MR_newMainQueueContext];
         [self MR_setDefaultContext:defaultContext];
         
-        [defaultContext setParentContext:rootSavingContext];
+        [defaultContext setParentContext:rootContext];
     }
 }
 
@@ -182,7 +182,7 @@ static NSString * const kMagicalRecordNSManagedObjectContextWorkingName = @"kNSM
             [context setPersistentStoreCoordinator:coordinator];
         }];
         
-        MRLog(@"-> Created %@", [context MR_description]);
+        MRLog(@"-> Created Context %@", [context MR_workingName]);
     }
     return context;
 }
diff --git a/MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m b/MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m
index aec15ad..7f1bc45 100644
--- a/MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m
+++ b/MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m
@@ -24,7 +24,7 @@
 {
     if (![self hasChanges])
     {
-        MRLog(@"NO CHANGES IN CONTEXT %@ - NOT SAVING", [self MR_description]);
+        MRLog(@"NO CHANGES IN ** %@ ** CONTEXT - NOT SAVING", [self MR_workingName]);
         return;
     }
     
@@ -72,16 +72,15 @@
 {
     [self performBlock:^{
         [self MR_saveWithErrorCallback:errorCallback];
-        if (self.parentContext) {
+        if ([self parentContext])
+        {
             [[self parentContext] performBlock:^{
                 [[self parentContext] MR_saveNestedContextsErrorHandler:errorCallback completion:completion];
             }];
-        } else {
-            if (completion) {
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    completion();
-                });
-            }
+        }
+        else if (completion)
+        {
+            dispatch_async(dispatch_get_main_queue(), completion);
         }
     }];
 }