From 13cf4c096fc673e43a22746342d25c506bde8405 Mon Sep 17 00:00:00 2001 From: Felix Ernst Date: Tue, 9 Apr 2024 05:53:41 +0000 Subject: [PATCH] Fix saving sort role after change from header This is a partial revert of 5186f09cabf0af4b0683e75b0bcde1061f84a67e. That commit tried to simplify code, however this lead to the saving of view properties being skipped, introducing the linked bug. The issue is that by the time the slotSortRoleChangedFromHeader() method is called, the model already changed its sort role. Therefore the check if the new role is identical to the old sort role fails and no saving would occur. With this partial revert the header will continue to change the sort role itself (which allows a minor optimization of not double sorting when also changing the sort order at the same time). The method slotSortRoleChangedFromHeader() is then only responsible for saving that change in the ViewProperties and telling the SortBy menu in the user interface that the sorting has changed. BUG: 480246 --- src/views/dolphinview.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 32209b9fb..613f99405 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -1936,7 +1936,10 @@ void DolphinView::slotSortRoleChangedByHeader(const QByteArray ¤t, const Q Q_UNUSED(previous) Q_ASSERT(m_model->sortRole() == current); - setSortRole(current); + ViewProperties props(viewPropertiesUrl()); + props.setSortRole(current); + + Q_EMIT sortRoleChanged(current); } void DolphinView::slotVisibleRolesChangedByHeader(const QList ¤t, const QList &previous) -- 2.47.3