From f9b021c94aea0be44cd17746f6ed4178992226ca Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Fri, 3 Nov 2023 21:38:12 +0900
Subject: [PATCH] Fix issue #2084: Close main window with 'Esc' if there is
 only one MDI child window

---
 Src/HexMergeView.cpp   | 4 +---
 Src/ImgMergeFrm.cpp    | 2 +-
 Src/WebPageDiffFrm.cpp | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Src/HexMergeView.cpp b/Src/HexMergeView.cpp
index 556cf9bd90e..c4e74b11b29 100644
--- a/Src/HexMergeView.cpp
+++ b/Src/HexMergeView.cpp
@@ -538,15 +538,13 @@ void CHexMergeView::OnEditClear()
  */
 BOOL CHexMergeView::PreTranslateMessage(MSG* pMsg)
 {
-	if (GetTopLevelFrame()->PreTranslateMessage(pMsg))
-		return TRUE;
 	if (pMsg->message == WM_KEYDOWN)
 	{
 		// Close window in response to VK_ESCAPE if user has allowed it from options
 		if (pMsg->wParam == VK_ESCAPE && GetOptionsMgr()->GetInt(OPT_CLOSE_WITH_ESC) != 0)
 		{
 			GetParentFrame()->PostMessage(WM_CLOSE, 0, 0);
-			return TRUE;
+			return false;
 		}
 	}
 	return m_pif->translate_accelerator(pMsg);
diff --git a/Src/ImgMergeFrm.cpp b/Src/ImgMergeFrm.cpp
index 45210b5ac1e..727860b8e25 100644
--- a/Src/ImgMergeFrm.cpp
+++ b/Src/ImgMergeFrm.cpp
@@ -1354,7 +1354,7 @@ BOOL CImgMergeFrame::PreTranslateMessage(MSG* pMsg)
 		if (pMsg->wParam == VK_ESCAPE && GetOptionsMgr()->GetInt(OPT_CLOSE_WITH_ESC) != 0)
 		{
 			PostMessage(WM_CLOSE, 0, 0);
-			return true;
+			return false;
 		}
 	}
 	return CMergeFrameCommon::PreTranslateMessage(pMsg);
diff --git a/Src/WebPageDiffFrm.cpp b/Src/WebPageDiffFrm.cpp
index cb5431e2366..5a5ae49d2a0 100644
--- a/Src/WebPageDiffFrm.cpp
+++ b/Src/WebPageDiffFrm.cpp
@@ -980,7 +980,7 @@ BOOL CWebPageDiffFrame::PreTranslateMessage(MSG* pMsg)
 		if (pMsg->wParam == VK_ESCAPE && GetOptionsMgr()->GetInt(OPT_CLOSE_WITH_ESC) != 0)
 		{
 			PostMessage(WM_CLOSE, 0, 0);
-			return true;
+			return false;
 		}
 	}
 	return CMergeFrameCommon::PreTranslateMessage(pMsg);