From 441070f4f2022fe1d48e42d6eb35e07869d2b055 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Thu, 1 Jul 2021 09:42:05 +0200
Subject: [PATCH] try to fix problems with next unread msg

---
 resources/desktop/com.github.rssguard.appdata.xml | 2 +-
 src/librssguard/gui/messagesview.cpp              | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml
index ecd1bec21..874f373e0 100644
--- a/resources/desktop/com.github.rssguard.appdata.xml
+++ b/resources/desktop/com.github.rssguard.appdata.xml
@@ -30,7 +30,7 @@
   <url type="donation">https://martinrotter.github.io/donate/</url>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="3.9.2" date="2021-06-30"/>
+    <release version="3.9.2" date="2021-07-01"/>
   </releases>
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">none</content_attribute>
diff --git a/src/librssguard/gui/messagesview.cpp b/src/librssguard/gui/messagesview.cpp
index f2ecb4442..723bf3ef1 100644
--- a/src/librssguard/gui/messagesview.cpp
+++ b/src/librssguard/gui/messagesview.cpp
@@ -581,10 +581,6 @@ void MessagesView::selectNextUnreadItem() {
   if (next_unread.isValid()) {
     // We found unread message, mark it.
     setCurrentIndex(next_unread);
-    selectionModel()->select(next_unread,
-                             QItemSelectionModel::SelectionFlag::ClearAndSelect |
-                             QItemSelectionModel::SelectionFlag::Rows);
-    setFocus();
 
     // Make sure that item is properly visible even if
     // message previewer was hidden and shows up.
@@ -594,6 +590,11 @@ void MessagesView::selectNextUnreadItem() {
              !m_processingMouse && qApp->settings()->value(GROUP(Messages), SETTING(Messages::KeepCursorInCenter)).toBool()
              ? QAbstractItemView::ScrollHint::PositionAtCenter
              : QAbstractItemView::ScrollHint::PositionAtTop);
+
+    selectionModel()->select(next_unread,
+                             QItemSelectionModel::SelectionFlag::Select |
+                             QItemSelectionModel::SelectionFlag::Rows);
+    setFocus();
   }
 }