diff options
| author | Cédric Luthi <cluthi@sente.ch> | 2009-08-26 11:13:36 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2009-11-02 13:15:47 (GMT) |
| commit | 5b21746da4899a7d6dd78cf949e0a918c127fd49 (patch) | |
| tree | a017c1c4dafc17118f43dbb18c088f6e35087c2b /src/gui | |
| parent | 0dc3e7f6b482d359b10bfe4e0a3032644b77c94b (diff) | |
| download | Qt-5b21746da4899a7d6dd78cf949e0a918c127fd49.zip Qt-5b21746da4899a7d6dd78cf949e0a918c127fd49.tar.gz Qt-5b21746da4899a7d6dd78cf949e0a918c127fd49.tar.bz2 | |
Fix a freeze in QFileDialog (Mac)
Running an open file dialog, for example with QFileDialog::getOpenFileName() can lead to a freeze if the user selects a folder, then selects a file in the parent folder and finally confirms the open dialog.
Merge-request: 1327
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/dialogs/qfiledialog_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qfiledialog_mac.mm b/src/gui/dialogs/qfiledialog_mac.mm index 3914ab1..8bca025 100644 --- a/src/gui/dialogs/qfiledialog_mac.mm +++ b/src/gui/dialogs/qfiledialog_mac.mm @@ -819,8 +819,8 @@ void QFileDialogPrivate::qt_mac_filedialog_event_proc(const NavEventCallbackMess || mode == QFileDialog::ExistingFiles){ // When changing directory, the current selection is cleared if // we are supposed to be selecting files only: - fileDialogPrivate->mCurrentSelectionList.clear(); if (!fileDialogPrivate->mCurrentSelection.isEmpty()){ + fileDialogPrivate->mCurrentSelectionList.clear(); fileDialogPrivate->mCurrentSelection.clear(); emit fileDialogPrivate->q_func()->currentChanged(fileDialogPrivate->mCurrentSelection); } |