Automatic rescanning was not disabled everywhere.

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index 13ca7c7..fc208a7 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -15,6 +15,7 @@ WinMerge 2.3.11
   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)
 
 WinMerge 2.13.10 2009-12-21 (r7051)
   Visual Studio project files upgraded to VS2005 format (r7045)

diff --git a/Src/MergeDoc.h b/Src/MergeDoc.h
index 61a8cb5..b1ee173 100644 (file)
--- a/Src/MergeDoc.h
+++ b/Src/MergeDoc.h
@@ -234,6 +234,7 @@ 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 085b859..64c1df2 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -1635,6 +1635,7 @@ bool CMergeEditView::EnableRescan(bool bEnable)
 {
        bool bOldValue = m_bAutomaticRescan;
        m_bAutomaticRescan = bEnable;
+       GetDocument()->SetAutomaticRescan(m_bAutomaticRescan);
        return bOldValue;
 }
 
@@ -2340,6 +2341,7 @@ 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);