From 246a3b3d7fcb38c0f8b5b141b253d50fcbf4f600 Mon Sep 17 00:00:00 2001
From: lovetox <philipp@hoerist.com>
Date: Sun, 4 Apr 2021 23:51:48 +0200
Subject: [PATCH] Fix readmarker breaking merge
---
gajim/gtk/conversation/view.py | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/gajim/gtk/conversation/view.py b/gajim/gtk/conversation/view.py
index 9287069234..6ca4d31872 100644
--- a/gajim/gtk/conversation/view.py
+++ b/gajim/gtk/conversation/view.py
@@ -236,6 +236,9 @@ def _find_ancestor(self, message):
if row is None:
return None
+ if row.type == 'read_marker':
+ continue
+
if row.type != 'chat':
return None
@@ -254,6 +257,9 @@ def _update_descendants(self, message):
if row is None:
return
+ if row.type == 'read_marker':
+ continue
+
if row.type != 'chat':
return
--
GitLab