FreshRSS/rssguard
1
0
Fork 0
mirror of https://github.com/martinrotter/rssguard.git synced 2025-01-28 08:09:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix #507 for good - note that there was some very common code changed, feared of regressions, hopefully, they will not be there

Browse Source
This commit is contained in:
Martin Rotter 2021-10-08 11:54:03 +02:00
parent 8890f378d4
commit 6a3b0edba8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/librssguard/gui/messagesview.cpp
View File

@ -147,6 +147,9 @@ void MessagesView::keyboardSearch(const QString& search) {
void MessagesView::reloadSelections() { void MessagesView::reloadSelections() {
const QDateTime dt1 = QDateTime::currentDateTime(); const QDateTime dt1 = QDateTime::currentDateTime();
QModelIndex current_index = selectionModel()->currentIndex(); QModelIndex current_index = selectionModel()->currentIndex();
const bool is_current_selected = selectionModel()->selectedRows().contains(m_proxyModel->index(current_index.row(),
0,
current_index.parent()));
const QModelIndex mapped_current_index = m_proxyModel->mapToSource(current_index); const QModelIndex mapped_current_index = m_proxyModel->mapToSource(current_index);
const Message selected_message = m_sourceModel->messageAt(mapped_current_index.row()); const Message selected_message = m_sourceModel->messageAt(mapped_current_index.row());
const int col = header()->sortIndicatorSection(); const int col = header()->sortIndicatorSection();
@ -157,7 +160,8 @@ void MessagesView::reloadSelections() {
// Now, we must find the same previously focused message. // Now, we must find the same previously focused message.
if (selected_message.m_id > 0) { if (selected_message.m_id > 0) {
if (m_proxyModel->rowCount() == 0) { if (m_proxyModel->rowCount() == 0 ||
!is_current_selected) {
current_index = QModelIndex(); current_index = QModelIndex();
} }
else { else {