Fix issue #2084: Close main window with 'Esc' if there is only one MD…

…I child window
WinMerge · Nov 3, 2023 · f9b021c · f9b021c
1 parent 64d0eed
commit f9b021c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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);