BUG: #2995925 No refreshing after merging difference

Revert revisions 7086 and 7089 to fix the regression.

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index a9bba81..ab6c3c6 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -7,6 +7,7 @@ WinMerge 2.13.13
   Installer: Embed MS runtime files installer for x64 (r7150)
   Bugfix: Compare by size always checked file times too (#2919510)
   Bugfix: Line filtering wasted huge amounts of memory (#3014162)
+  Bugfix: Difference blocks not cleared after merging (#2995925)
   Translation updates:
   - Japanese (r7153)
 
@@ -36,7 +37,6 @@ WinMerge 2.13.11 - 2010-01-15 (r7111)
   Bugfix: Pane headers not updated after language change (#2923684)
   Bugfix: File panes become unaligned when last line didn't have
     an EOL byte (#2922517)
-  Bugfix: Automatic rescanning was not disabled everywhere (r7086,r7089)
   Bugfix: Quick contents compare didn't ignore EOL byte differences (#2929005)
   Translation updates:
   - Slovenian (#2917796, #2932094)

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index f96e973..37b268f 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -2277,7 +2277,7 @@ OPENRESULTS_TYPE CMergeDoc::OpenDocs(FileLocation filelocLeft, FileLocation file
        }
 
        BOOL bBinary = FALSE;
-       nRescanResult = Rescan(bBinary, bIdentical, TRUE);
+       nRescanResult = Rescan(bBinary, bIdentical);
 
        // Open filed if rescan succeed and files are not binaries
        if (nRescanResult == RESCAN_OK)

diff --git a/Src/MergeDoc.h b/Src/MergeDoc.h
index b1ee173..61a8cb5 100644 (file)
--- a/Src/MergeDoc.h
+++ b/Src/MergeDoc.h
@@ -234,7 +234,6 @@ public:
        void SetMergingMode(bool bMergingMode);
        void SetDetectMovedBlocks(bool bDetectMovedBlocks);
        bool IsMixedEOL(int nBuffer) const;
-       void SetAutomaticRescan(bool bRescan) { m_bEnableRescan = bRescan; }
 
 // implementation methods
 private:

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index f28833c..99f9ab8 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -1635,7 +1635,6 @@ bool CMergeEditView::EnableRescan(bool bEnable)
 {
        bool bOldValue = m_bAutomaticRescan;
        m_bAutomaticRescan = bEnable;
-       GetDocument()->SetAutomaticRescan(m_bAutomaticRescan);
        return bOldValue;
 }
 
@@ -2334,7 +2333,6 @@ void CMergeEditView::OnUpdateWMGoto(CCmdUI* pCmdUI)
 void CMergeEditView::RefreshOptions()
 { 
        m_bAutomaticRescan = GetOptionsMgr()->GetBool(OPT_AUTOMATIC_RESCAN);
-       GetDocument()->SetAutomaticRescan(m_bAutomaticRescan);
 
        if (GetOptionsMgr()->GetInt(OPT_TAB_TYPE) == 0)
                SetInsertTabs(true);