From de704b633d4f9469a868e86fc22b8d99ef61eacb Mon Sep 17 00:00:00 2001 From: Vladimir Belyavsky Date: Fri, 13 Jan 2023 14:03:09 +0300 Subject: Windows: fix warning on opening FileDialog after changing filters Destroy native file dialog on Windows as soon as it closes. Currently the instance of native file dialog on Windows may stay live even when a FileDialog control was closed and won't be opened anymore in the app session. At the same time, when the FileDialog is opened again, the instance of native file dialog is recreated so we don't need to keep previous instance, because this may lead to situation when QQuickFileDialog configures old instance of the native dialog, which is causing problems. Fixes: QTBUG-61042 Fixes: QTBUG-77211 Pick-to: 6.4 6.5 Change-Id: Ia537264e8494b83dec7d5139744838242b281f1f Reviewed-by: Shawn Rutledge --- src/plugins/platforms/windows/qwindowsdialoghelpers.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/plugins/platforms/windows/qwindowsdialoghelpers.cpp') diff --git a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp index 8f0cd3857e..7b49a424e2 100644 --- a/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp +++ b/src/plugins/platforms/windows/qwindowsdialoghelpers.cpp @@ -236,7 +236,7 @@ QWindowsNativeDialogBase *QWindowsDialogHelperBase::ensureNativeDialo // Create dialog and apply common settings. Check "executed" flag as well // since for example IFileDialog::Show() works only once. if (m_nativeDialog.isNull() || m_nativeDialog->executed()) - m_nativeDialog = QWindowsNativeDialogBasePtr(createNativeDialog()); + m_nativeDialog = QWindowsNativeDialogBasePtr(createNativeDialog(), &QObject::deleteLater); return m_nativeDialog.data(); } @@ -321,12 +321,13 @@ void QWindowsDialogHelperBase::stopTimer() } } - template void QWindowsDialogHelperBase::hide() { - if (m_nativeDialog) + if (m_nativeDialog) { m_nativeDialog->close(); + m_nativeDialog.clear(); + } m_ownerWindow = nullptr; } -- cgit v1.2.3