From 68d14709e90bf39a0d032e1702977147ba67cbed Mon Sep 17 00:00:00 2001
From: Ryan Zhao <ryanzhaors@qq.com>
Date: Mon, 2 Aug 2021 11:59:01 +1000
Subject: [PATCH] fix a race condition

---
 Session/Conversations/ConversationVC.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Session/Conversations/ConversationVC.swift b/Session/Conversations/ConversationVC.swift
index 439394502..37b069500 100644
--- a/Session/Conversations/ConversationVC.swift
+++ b/Session/Conversations/ConversationVC.swift
@@ -488,7 +488,7 @@ final class ConversationVC : BaseVC, ConversationViewModelDelegate, OWSConversat
     }
     
     func updateUnreadCountView() {
-        let visibleViewItems = (messagesTableView.indexPathsForVisibleRows ?? []).map { viewItems[$0.row] }
+        let visibleViewItems = (messagesTableView.indexPathsForVisibleRows ?? []).map { viewItems[ifValid: $0.row] }
         for visibleItem in visibleViewItems {
             guard let index = unreadViewItems.firstIndex(where: { $0 === visibleItem }) else { continue }
             unreadViewItems.remove(at: index)