[ 782866 ] round off in CMergeDoc::RescanIfNeeded

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index c8c6d44..96c1023 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -1717,7 +1717,7 @@ void CMergeDoc::RescanIfNeeded()
        {
                m_bNeedIdleRescan = FALSE;
                COleDateTimeSpan elapsed = COleDateTime::GetCurrentTime() - m_LastRescan;
-               if (elapsed.GetTotalSeconds() > 1)
+               if (elapsed.GetTotalSeconds() >= 1)
                {
                        WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_RESCANNING));
                        FlushAndRescan();

diff --git a/Src/readme.txt b/Src/readme.txt
index 5d8326d..25d2527 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2003-08-04 Laoran
+ PATCH: [ 782866 ] round off in CMergeDoc::RescanIfNeeded
+  WinMerge: MergeDoc.cpp
+
 2003-08-04 Kimmo
  PATCH: [ 780359 ] Open identical files
   WinMerge: DirView.cpp MainFrm.cpp