From 66b9dd823da18862cb89c90222494b3a4f69ccef Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Wed, 21 Oct 2020 15:07:13 -0400
Subject: [PATCH] conversations: prevent account reselection on filterChanged
 event

Change-Id: Iab0a6a2316ccc3529829e9ff9cdd3ca643ccdac2
---
 src/conversationsadapter.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/conversationsadapter.cpp b/src/conversationsadapter.cpp
index ed7e51416..b9333b272 100644
--- a/src/conversationsadapter.cpp
+++ b/src/conversationsadapter.cpp
@@ -94,7 +94,7 @@ ConversationsAdapter::selectConversation(const QString& accountId, const QString
             Utils::oneShotConnect(&LRCInstance::instance(),
                                   &LRCInstance::currentAccountChanged,
                                   [selectConversation] { selectConversation(); });
-            LRCInstance::setSelectedConvId(); // Hack UI
+            LRCInstance::setSelectedConvId();
             LRCInstance::setSelectedAccountId(convInfo.accountId);
         } else {
             selectConversation();
@@ -224,7 +224,8 @@ ConversationsAdapter::connectConversationModel(bool updateFilter)
                                                     conversationSmartListModel_
                                                         ->fillConversationsList();
                                                     updateConversationsFilterWidget();
-                                                    emit indexRepositionRequested();
+                                                    if (!LRCInstance::getCurrentConvUid().isEmpty())
+                                                        emit indexRepositionRequested();
                                                     emit updateListViewRequested();
                                                 });
 
-- 
GitLab