From 3eac339ffe5dbbadee057c021b52817380250c4f Mon Sep 17 00:00:00 2001
From: ismailgulek <ismailg@matrix.org>
Date: Mon, 7 Feb 2022 12:52:33 +0300
Subject: [PATCH 1/2] Avoid data source reload on thread screen itself

---
 Riot/Modules/Room/DataSources/RoomDataSource.m | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Riot/Modules/Room/DataSources/RoomDataSource.m b/Riot/Modules/Room/DataSources/RoomDataSource.m
index 721d40b8f..da550e643 100644
--- a/Riot/Modules/Room/DataSources/RoomDataSource.m
+++ b/Riot/Modules/Room/DataSources/RoomDataSource.m
@@ -1000,6 +1000,11 @@ const CGFloat kTypingCellHeight = 24;
 
 - (void)newThreadCreated:(NSNotification *)notification
 {
+    if (self.threadId)
+    {
+        //  no need to reload the thread screen
+        return;
+    }
     NSUInteger count = 0;
     @synchronized (bubbles)
     {

From 52e51f04397aa81d5e93793a6deff7a804420ca7 Mon Sep 17 00:00:00 2001
From: ismailgulek <ismailg@matrix.org>
Date: Mon, 7 Feb 2022 12:53:08 +0300
Subject: [PATCH 2/2] Add changelog

---
 changelog.d/5263.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/5263.bugfix

diff --git a/changelog.d/5263.bugfix b/changelog.d/5263.bugfix
new file mode 100644
index 000000000..cc00e2a0c
--- /dev/null
+++ b/changelog.d/5263.bugfix
@@ -0,0 +1 @@
+RoomDataSource: Avoid reloading of data source on thread screen itself.