From 2aa9f7c2550cfa897b815fbe19e589c7b3b7eddf Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 17 May 2021 14:17:01 +0200 Subject: [PATCH] Revert, should work --- src/librssguard/gui/dialogs/formmain.cpp | 2 +- src/librssguard/gui/messagesview.cpp | 6 +----- src/librssguard/gui/messagesview.h | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/librssguard/gui/dialogs/formmain.cpp b/src/librssguard/gui/dialogs/formmain.cpp index 4a2ce0074..29814a4fc 100755 --- a/src/librssguard/gui/dialogs/formmain.cpp +++ b/src/librssguard/gui/dialogs/formmain.cpp @@ -396,7 +396,7 @@ void FormMain::onFeedUpdatesFinished(const FeedDownloadResults& results) { Q_UNUSED(results) statusBar()->clearProgressFeeds(); - tabWidget()->feedMessageViewer()->messagesView()->reloadSelections(true); + tabWidget()->feedMessageViewer()->messagesView()->reloadSelections(); } void FormMain::onFeedUpdatesStarted() { diff --git a/src/librssguard/gui/messagesview.cpp b/src/librssguard/gui/messagesview.cpp index dea0dc45f..ee544d0d6 100644 --- a/src/librssguard/gui/messagesview.cpp +++ b/src/librssguard/gui/messagesview.cpp @@ -84,7 +84,7 @@ void MessagesView::keyboardSearch(const QString& search) { setSelectionMode(QAbstractItemView::SelectionMode::ExtendedSelection); } -void MessagesView::reloadSelections(bool only_if_nothing_selected) { +void MessagesView::reloadSelections() { const QDateTime dt1 = QDateTime::currentDateTime(); QModelIndex current_index = selectionModel()->currentIndex(); const QModelIndex mapped_current_index = m_proxyModel->mapToSource(current_index); @@ -92,10 +92,6 @@ void MessagesView::reloadSelections(bool only_if_nothing_selected) { const int col = header()->sortIndicatorSection(); const Qt::SortOrder ord = header()->sortIndicatorOrder(); - if (only_if_nothing_selected && selected_message.m_id > 0) { - return; - } - // Reload the model now. sort(col, ord, true, false, false); diff --git a/src/librssguard/gui/messagesview.h b/src/librssguard/gui/messagesview.h index 91a26e197..549ac29b2 100644 --- a/src/librssguard/gui/messagesview.h +++ b/src/librssguard/gui/messagesview.h @@ -29,7 +29,7 @@ class MessagesView : public QTreeView { // Called after data got changed externally // and it needs to be reloaded to the view. - void reloadSelections(bool only_if_nothing_selected = false); + void reloadSelections(); // Loads un-deleted messages from selected feeds. void loadItem(RootItem* item);