MacGui: write the queue to disk less often and add some validations when reading it back from disk.

1 files changed, 12 insertions, 1 deletions

diff --git a/macosx/HBDistributedArray.m b/macosx/HBDistributedArray.m
index f92abfdf5..cac504456 100644
--- a/macosx/HBDistributedArray.m
+++ b/macosx/HBDistributedArray.m
@@ -167,7 +167,7 @@ NSString *HBDistributedArraWrittenToDisk = @"HBDistributedArraWrittenToDisk";
 {
     // Save changes to disk
     // and unlock
-    [self synchronize];
+    [self synchronizeIfNeeded];
     [self unlock];
 }
 
@@ -244,6 +244,17 @@ NSString *HBDistributedArraWrittenToDisk = @"HBDistributedArraWrittenToDisk";
 }
 
 /**
+ *  Writes the changes to disk only if we aren't exiting a recursive lock
+ */
+- (void)synchronizeIfNeeded
+{
+    if (self.mutexCount == 1)
+    {
+        [self synchronize];
+    }
+}
+
+/**
  *  Writes the changes to disk
  */
 - (void)synchronize