PATCH: [ 726330 ] Saving before refresh - backout saving - see bug [ 723412 ]

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 67cc14a..c419639 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -223,11 +223,7 @@ static void PrepareBufferForRescan(CMergeDoc::CDiffTextBuffer * buf, DWORD delet
 
 BOOL CMergeDoc::Rescan(BOOL bForced /* =FALSE */)
 {
-       // When doing forced rescan, delete temp files first
-       // to make sure we compare right files
-       if (bForced)
-               CleanupTempFiles();
-       else
+       if (!bForced)
                if (!m_bEnableRescan) return TRUE; // What return value ?
 
        m_bNeedIdleRescan = FALSE;

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 7a62c8a..a5466ef 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -782,6 +782,5 @@ void CMergeEditView::OnRefresh()
 {
        CMergeDoc *pd = GetDocument();
        ASSERT(pd);
-       if (pd->SaveHelper())
-               pd->FlushAndRescan(TRUE);
+       pd->FlushAndRescan(TRUE);
 }

diff --git a/Src/readme.txt b/Src/readme.txt
index 29d575a..b5cc322 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2003-04-28 Kimmo
+ PATCH: [ 726330 ] Saving before refresh - backout saving - see bug [ 723412 ]
+  WinMerge: MergeDoc.cpp MergeEditView.cpp
+
 2003-04-27 Kimmo
  BUG: [ 728173 ] Autoscroll first diff breaks syntax hilight
   WinMerge: MergeDoc.cpp