PATCH: [ 791924 ] Fix sorting when columns are reordered

diff --git a/Src/DirView.cpp b/Src/DirView.cpp
index fe8fd3f..fb7f5f0 100644 (file)
--- a/Src/DirView.cpp
+++ b/Src/DirView.cpp
@@ -437,13 +437,14 @@ void CDirView::OnColumnClick(NMHDR *pNMHDR, LRESULT *pResult)
 {
        // set sort parameters and handle ascending/descending
        NM_LISTVIEW* pNMListView = (NM_LISTVIEW*) pNMHDR;
-       if(pNMListView->iSubItem==m_sortColumn)
+       int sortcol = m_invcolorder[pNMListView->iSubItem];
+       if (sortcol==m_sortColumn)
        {
                m_bSortAscending = !m_bSortAscending;
        }
        else
        {
-               m_sortColumn = pNMListView->iSubItem;
+               m_sortColumn = sortcol;
                // date columns get default descending sort.
                if(m_sortColumn==DV_LTIME || m_sortColumn==DV_RTIME)
                {

diff --git a/Src/readme.txt b/Src/readme.txt
index a0b2bc9..a13cde3 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2003-08-20 Perry
+ PATCH: [ 791924 ] Fix sorting when columns are reordered
+  WinMerge: DirView.cpp
+
 2003-08-20 Kimmo
  PATCH: [ 791263 ] Remove CStringEx from OpenDlg (and from WinMerge?)
   WinMerge: Merge.dsp OpenDlg.cpp