use the proxy model categorization state to check whether it has changed, not the...

svn path=/trunk/KDE/kdebase/apps/; revision=717555

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 6cf2c1a8242bf044afdc7b16ea8ff7223025fdbe..edecf199a1c20d75999c9d0f17f1f3ec3331bb0a 100644 (file)
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -175,7 +175,7 @@ void DolphinView::setMode(Mode mode)
     // capabilities.
     m_storedCategorizedSorting = props.categorizedSorting();
     const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
-    if (categorized != categorizedSorting()) {
+    if (categorized != m_proxyModel->isCategorizedModel()) {
         m_proxyModel->setCategorizedModel(categorized);
         m_proxyModel->sort(m_proxyModel->sortColumn(), m_proxyModel->sortOrder());
         emit categorizedSortingChanged();
@@ -630,7 +630,7 @@ void DolphinView::applyViewProperties(const KUrl& url)
 
     m_storedCategorizedSorting = props.categorizedSorting();
     const bool categorized = m_storedCategorizedSorting && supportsCategorizedSorting();
-    if (categorized != categorizedSorting()) {
+    if (categorized != m_proxyModel->isCategorizedModel()) {
         m_proxyModel->setCategorizedModel(categorized);
         m_proxyModel->sort(m_proxyModel->sortColumn(), m_proxyModel->sortOrder());
         emit categorizedSortingChanged();