[ 700872 ] Esc to close crashes WinMerge

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index 1d8ce85..98d5e90 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -355,7 +355,12 @@ BOOL CMergeApp::PreTranslateMessage(MSG* pMsg)
                        return FALSE;
                }
                else
+               {
                        AfxGetMainWnd()->PostMessage(WM_COMMAND, ID_FILE_CLOSE);
+                       // Clear pointers that is now invalid 
+                       ((CMainFrame*)m_pMainWnd)->m_pLeft = NULL;
+                       ((CMainFrame*)m_pMainWnd)->m_pRight = NULL;
+               }
        }
 
        // CG: The following lines were added by the Splash Screen component.

diff --git a/Src/readme.txt b/Src/readme.txt
index 0132c92..fce9d94 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,7 @@
+2003-03-11 Christian
+ PATCH: [ 700872 ] Esc to close crashes WinMerge
+  WinMerge: Merge.cpp
+
 2003-03-09 Kimmo
  PATCH: [ 699839 ] Add same binaries to dir compare status
   WinMerge: MainFrm.h MainFrm.cpp