From 3b6e8700b4638d15f766906794e8ddc82dd03edb Mon Sep 17 00:00:00 2001 From: fiaxh Date: Tue, 28 Apr 2020 23:11:08 +0200 Subject: ConversationSummaryView: Fix crash when accessing content_item's first() or last() if the TreeSet is empty --- main/src/ui/conversation_content_view/conversation_view.vala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main/src/ui/conversation_content_view') diff --git a/main/src/ui/conversation_content_view/conversation_view.vala b/main/src/ui/conversation_content_view/conversation_view.vala index 1cf15892..dd68cef0 100644 --- a/main/src/ui/conversation_content_view/conversation_view.vala +++ b/main/src/ui/conversation_content_view/conversation_view.vala @@ -443,7 +443,7 @@ public class ConversationView : Box, Plugins.ConversationItemCollection, Plugins private void load_earlier_messages() { was_value = scrolled.vadjustment.value; if (!reloading_mutex.trylock()) return; - if (meta_items.size > 0) { + if (content_items.size > 0) { Gee.List items = content_populator.populate_before(conversation, (content_items.first() as ContentMetaItem).content_item, 20); foreach (ContentMetaItem item in items) { do_insert_item(item); @@ -455,7 +455,7 @@ public class ConversationView : Box, Plugins.ConversationItemCollection, Plugins private void load_later_messages() { if (!reloading_mutex.trylock()) return; - if (meta_items.size > 0 && !at_current_content) { + if (content_items.size > 0 && !at_current_content) { Gee.List items = content_populator.populate_after(conversation, (content_items.last() as ContentMetaItem).content_item, 20); if (items.size == 0) { at_current_content = true; -- cgit v1.2.3-70-g09d2