Automatic rescanning was not disabled everywhere.

Add forced rescan after loading documents (spotted by Matthias).

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index fc208a7..f7abf75 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -15,7 +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)
+  Bugfix: Automatic rescanning was not disabled everywhere (r7086,r7089)
 
 WinMerge 2.13.10 2009-12-21 (r7051)
   Visual Studio project files upgraded to VS2005 format (r7045)

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