From 41a37ea58770d4b07e29c2a88d668df06531662c Mon Sep 17 00:00:00 2001 From: Christian List Date: Tue, 11 Mar 2003 17:06:58 +0000 Subject: [PATCH] [ 700872 ] Esc to close crashes WinMerge --- Src/Merge.cpp | 5 +++++ Src/readme.txt | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/Src/Merge.cpp b/Src/Merge.cpp index 1d8ce856f..98d5e90a6 100644 --- 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 0132c9280..fce9d946e 100644 --- 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 -- 2.11.0