From 11d5cb809582bbec40d531b29350bb5480605435 Mon Sep 17 00:00:00 2001
From: Whindmar Saksit <whindsaks@proton.me>
Date: Sat, 30 Nov 2024 22:05:50 +0100
Subject: [PATCH] [BROWSEUI] FindFolder must release the view and the browser
 (#7529)

CORE-19780
---
 dll/win32/browseui/shellfind/CFindFolder.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dll/win32/browseui/shellfind/CFindFolder.cpp b/dll/win32/browseui/shellfind/CFindFolder.cpp
index 1c254e75ab5..ea703158c30 100644
--- a/dll/win32/browseui/shellfind/CFindFolder.cpp
+++ b/dll/win32/browseui/shellfind/CFindFolder.cpp
@@ -937,6 +937,12 @@ STDMETHODIMP CFindFolder::MessageSFVCB(UINT uMsg, WPARAM wParam, LPARAM lParam)
             CComVariant searchBar(pwszGuid);
             return pWebBrowser2->ShowBrowserBar(&searchBar, NULL, NULL);
         }
+        case SFVM_WINDOWCLOSING:
+        {
+            m_shellFolderView = NULL;
+            m_shellBrowser = NULL;
+            return S_OK;
+        }
         case SFVM_GETCOMMANDDIR:
         {
             HRESULT hr = E_FAIL;