From 58ca15cdf5aa4d741f10b36e7b71503fbba182cb Mon Sep 17 00:00:00 2001 From: Oliver Eftevaag Date: Wed, 30 Jul 2025 11:04:31 +0200 Subject: FileDialog: don't crash if it fails to create the non-native file dialog Most overrides in QQuickPlatformFileDialog didn't make the assumption that the FileDialog.qml component would successfully be created, except for selectedFiles. Also, new in 6.10 is that we're setting the popupType QQuickFileDialog. Make sure we check for nullptr. Pick-to: 6.10 Change-Id: Icb7766434245e72bd0680bbeec75dd510fa4642d Reviewed-by: Jonas Karlsson --- src/quickdialogs/quickdialogsquickimpl/qquickplatformfiledialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/quickdialogs/quickdialogsquickimpl/qquickplatformfiledialog.cpp') diff --git a/src/quickdialogs/quickdialogsquickimpl/qquickplatformfiledialog.cpp b/src/quickdialogs/quickdialogsquickimpl/qquickplatformfiledialog.cpp index 1334a8ccdf..f41c3f2c58 100644 --- a/src/quickdialogs/quickdialogsquickimpl/qquickplatformfiledialog.cpp +++ b/src/quickdialogs/quickdialogsquickimpl/qquickplatformfiledialog.cpp @@ -121,7 +121,7 @@ void QQuickPlatformFileDialog::selectFile(const QUrl &file) // TODO: support for multiple selected files QList QQuickPlatformFileDialog::selectedFiles() const { - if (m_dialog->selectedFile().isEmpty()) + if (!m_dialog || m_dialog->selectedFile().isEmpty()) return {}; return { m_dialog->selectedFile() }; -- cgit v1.2.3