Fix a crash that can occur when updating timeline items in a backgrou…

…nd thread (#2268)
element-hq · Dec 19, 2023 · 8dd66d3 · 8dd66d3
1 parent c7276a6
commit 8dd66d3
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineController.swift b/ElementX/Sources/Services/Timeline/TimelineController/RoomTimelineController.swift
@@ -238,7 +238,9 @@ class RoomTimelineController: RoomTimelineControllerProtocol {
 
     @objc private func contentSizeCategoryDidChange() {
         // Recompute all attributed strings on content size changes -> DynamicType support
-        updateTimelineItems()
+        serialDispatchQueue.async {
+            self.updateTimelineItems()
+        }
     }
 
     private func updateTimelineItems() {
@@ -303,7 +305,9 @@ class RoomTimelineController: RoomTimelineControllerProtocol {
             }
         }
 
-        timelineItems = newTimelineItems
+        DispatchQueue.main.sync {
+            timelineItems = newTimelineItems
+        }
 
         callbacks.send(.updatedTimelineItems)
         callbacks.send(.canBackPaginate(canBackPaginate))