PATCH: [ 724493 ] WaitStatusCursor for MergeDoc rescans

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index c10fc3b..72c6667 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -1387,6 +1387,8 @@ void CMergeDoc::FlushAndRescan()
 {
        if (!m_bEnableRescan) return;
 
+       WaitStatusCursor waitstatus(LoadResString(IDS_STATUS_RESCANNING));
+
        CMDIFrameWnd* mainWnd = dynamic_cast<CMDIFrameWnd*>(AfxGetMainWnd());
        CMDIChildWnd* diffWnd = dynamic_cast<CMDIChildWnd*>(mainWnd->MDIGetActive());
        CCrystalEditView* curView = dynamic_cast<CCrystalEditView*>(diffWnd->GetActiveView());

diff --git a/Src/readme.txt b/Src/readme.txt
index 20260a8..3541213 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -10,6 +10,8 @@
   WinMerge: DirDoc.cpp
  bugfix: Add new files that were part of patch#724309
   WinMerge: WaitStatusCursor.cpp WaitStatusCursor.h
+ PATCH: [ 724493 ] WaitStatusCursor for MergeDoc rescans
+  WinMerge: MergeDoc.cpp
 
 2003-04-19 Perry
  [ 724280 ] Could use wait cursors at OpenSelection calls