Implement fix for BUG#794514: 'Comparison Summary' not updated properly

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index a55df74..ab7fc1d 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -574,12 +574,12 @@ void CDirDoc::UpdateChangedItem(LPCTSTR pathLeft, LPCTSTR pathRight, bool unifie
        DIFFITEM current = m_pCtxt->GetDiffAt(pos);
        m_pCtxt->UpdateInfoFromDisk(current);
 
-       if (unified)
-       {
-               // files have been unified -- that is, they are now identical
-               UINT status = FILE_SAME;
-               m_pCtxt->UpdateStatusCode(pos, (BYTE)status);
-       }
+       // Figure out new status code
+       current.code = (unified ? FILE_SAME : FILE_DIFF);
+
+       // Save new status code to diff context memory
+       m_pCtxt->UpdateStatusCode(pos, current.code);
 
+       // Update view
        UpdateScreenItemStatus(ind, current);
 }

diff --git a/Src/readme.txt b/Src/readme.txt
index a1da646..838dd09 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,10 +1,14 @@
+2003-08-26 Perry
+ Implement fix for BUG#794514: 'Comparison Summary' not updated properly
+  WinMerge: DirDoc.cpp
+  
 2003-08-25 Laoran
-  [ 783507 ] normalize replaceSelection and ListCopy
+ [ 783507 ] normalize replaceSelection and ListCopy
   WinMerge: GhostTextBuffer.cpp GhostTextBuffer.h MergeDoc.cpp MergeDoc.h
   editlib : ccrystaleditview.cpp ccrystaltextbuffer.cpp ccrystaltextbuffer.h
 
 2003-08-25 Laoran
-  [ 794081 ] Error when dropping a column out of WinMerge
+ [ 794081 ] Error when dropping a column out of WinMerge
   WinMerge: DirView.cpp
   
 2003-08-24 Perry