Nikolay Sivov : comdlg32: Detach file dialog data after child windows were destroyed.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b8d1e929e7d9d847b898c05e95112be12292adf7
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=b8d1e929e7d9d847b898c05e9...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Tue Mar 20 10:37:48 2018 +0300

comdlg32: Detach file dialog data after child windows were destroyed.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/comdlg32/filedlg.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c
index fa9ecfb..81eaeca 100644
--- a/dlls/comdlg32/filedlg.c
+++ b/dlls/comdlg32/filedlg.c
@@ -1331,9 +1331,13 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l
               SendDlgItemMessageW(hwnd, IDC_TOOLBARPLACES, TB_SETIMAGELIST, 0, 0);
               ImageList_Destroy(himl);
           }
-          RemovePropW(hwnd, filedlg_info_propnameW);
           return FALSE;
       }
+
+    case WM_NCDESTROY:
+        RemovePropW(hwnd, filedlg_info_propnameW);
+        return 0;
+
     case WM_NOTIFY:
     {
 	LPNMHDR lpnmh = (LPNMHDR)lParam;