fixup! Fix threading in DatabaseContainer

GetStream · Apr 28, 2021 · 7fc5816 · 7fc5816
1 parent 9c8293e
commit 7fc5816
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Sources/StreamChat/Database/DatabaseContainer.swift b/Sources/StreamChat/Database/DatabaseContainer.swift
@@ -41,7 +41,7 @@ class DatabaseContainer: NSPersistentContainer {
         let context = newBackgroundContext()
         context.automaticallyMergesChangesFromParent = true
         context.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy
-        context.performAndWait { [localCachingSettings] in
+        context.perform { [localCachingSettings] in
             context.localCachingSettings = localCachingSettings
         }
         return context
@@ -59,7 +59,7 @@ class DatabaseContainer: NSPersistentContainer {
         let context = newBackgroundContext()
         context.automaticallyMergesChangesFromParent = true
         context.mergePolicy = NSMergeByPropertyObjectTrumpMergePolicy
-        context.performAndWait { [localCachingSettings] in
+        context.perform { [localCachingSettings] in
             context.localCachingSettings = localCachingSettings
         }
         return context
@@ -130,7 +130,7 @@ class DatabaseContainer: NSPersistentContainer {
         if Thread.current.isMainThread {
             viewContext.localCachingSettings = localCachingSettings
         } else {
-            viewContext.performAndWait { [localCachingSettings] in
+            viewContext.perform { [viewContext, localCachingSettings] in
                 viewContext.localCachingSettings = localCachingSettings
             }
         }