[ 687177 ] Handle more errors during copy/creation

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 952ec7b..ae09d71 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -363,6 +363,13 @@ void CMainFrame::ShowMergeDoc(LPCTSTR szLeft, LPCTSTR szRight)
                }
                else
                {
+                       // CMergeDoc::Rescan fails if files are identical, or 
+                       // does not exist on both sides (both of these cases put
+                       // up message boxes inside of CMergeDoc::Rescan)
+                       // or the really arcane case that the temp files couldn't 
+                       // be created, which is too obscure to bother reporting
+                       // if you can't write to your temp directory, doing nothing
+                       // is graceful enough for that).
                        m_pMergeDoc->m_pView->GetParentFrame()->DestroyWindow();
                        m_pMergeDoc=NULL;
                        m_pLeft = m_pRight = NULL;

diff --git a/Src/readme.txt b/Src/readme.txt
index b4b2e43..f0a4647 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,6 +1,8 @@
 2003-03-29 Perry
  PATCH: [ 710347 ] Fix crash of winmerge c:\ d:\
  WinMerge: DiffContext.h DirDoc.cpp MainFrm.cpp Merge.cpp OpenDlg.cpp OpenDlg.h paths.cpp paths.h
+ PATCH: [ 687177 ] Handle more errors during copy/creation
+ WinMerge: MainFrm.cpp
 
 2003-03-25 Perry
  PATCH: [ 709575 ] Fix sanity check in CChildFrame::UpdateHeaderSizes()