diff options
author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2021-11-16 17:25:55 +0100 |
---|---|---|
committer | Szabolcs David <davidsz@inf.u-szeged.hu> | 2021-11-17 16:04:41 +0100 |
commit | dfa69ea39fd524ef54b4a822d5a3163749d40ea5 (patch) | |
tree | 36079311a3424ffa07674ed3a7ade50693d855ee /src | |
parent | 89bb3c97eee9cd4bf9fb536f024715e606e49ae0 (diff) |
Fix crash in Quick file system access dialogs
In Quick examples, providing any answer to ui::SelectFileDialog::Listener
results immediate destruction of FilePickerController and its m_isHandled
flag remains false before the controller is destroyed. An "unhandled"
controller calls reject() in destructor, so the controller will be
answered twice.
Pick-to: 6.2
Change-Id: Iaff5b0f4f54b0b11a447ac624f5652e592a88e6e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/file_picker_controller.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/file_picker_controller.cpp b/src/core/file_picker_controller.cpp index 051b877a4..90f5dcc07 100644 --- a/src/core/file_picker_controller.cpp +++ b/src/core/file_picker_controller.cpp @@ -211,6 +211,7 @@ ASSERT_ENUMS_MATCH(FilePickerController::Save, blink::mojom::FileChooserParams_M void FilePickerController::filesSelectedInChooser(const QStringList &filesList) { + m_isHandled = true; if (d_ptr->fileDialogListener) { QStringList files(filesList); base::FilePath baseDir; @@ -244,7 +245,6 @@ void FilePickerController::filesSelectedInChooser(const QStringList &filesList) else d_ptr->fileSystemAccessDialogListener->MultiFilesSelected(files, nullptr); } - m_isHandled = true; } QStringList FilePickerController::acceptedMimeTypes() const |