From 9e62f4fe1ae4ce46fa8c97e930be8ed73a8a7df8 Mon Sep 17 00:00:00 2001 From: roytam1 Date: Sat, 17 Mar 2018 21:17:12 +0800 Subject: [PATCH] Restore commented out logic of preventing parent of modal window being able to close, which cause user-after-free afterwards. --- k-meleon/app/BrowserFrm.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/k-meleon/app/BrowserFrm.cpp b/k-meleon/app/BrowserFrm.cpp index 3ec9381a..5078e34a 100644 --- a/k-meleon/app/BrowserFrm.cpp +++ b/k-meleon/app/BrowserFrm.cpp @@ -1426,7 +1426,7 @@ INT_PTR CBrowserFrame::DoModal() CWinApp* pApp = AfxGetApp(); if (pApp != NULL) pApp->EnableModeless(FALSE); - /* + HWND hWndTop = NULL; HWND hWndParent = CWnd::GetSafeOwner_(GetParent()->GetSafeHwnd(), &hWndTop); @@ -1436,11 +1436,11 @@ INT_PTR CBrowserFrame::DoModal() ::EnableWindow(hWndParent, FALSE); ::EnableWindow(m_hWnd, TRUE); bEnableParent = TRUE; - }*/ + } m_nFlags |= WF_CONTINUEMODAL; RunModalLoop(0); - /* + if (bEnableParent) ::EnableWindow(hWndParent, TRUE); if (hWndParent != NULL && ::GetActiveWindow() == m_hWnd) @@ -1448,7 +1448,7 @@ INT_PTR CBrowserFrame::DoModal() if (::IsWindow(hWndTop)) ::EnableWindow(hWndTop, TRUE); - */ + if (pApp != NULL) pApp->EnableModeless(TRUE);