From 39064c42d5c51bf17c54166396f94f2b6d1d8319 Mon Sep 17 00:00:00 2001 From: Leland Lucius Date: Sat, 18 Jul 2015 21:26:11 -0500 Subject: [PATCH] FileDialog shouldn't return duplicate names. --- lib-src/FileDialog/mac/FileDialogPrivate.mm | 3 +++ src/Project.cpp | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/lib-src/FileDialog/mac/FileDialogPrivate.mm b/lib-src/FileDialog/mac/FileDialogPrivate.mm index f250780fe..7b8ba8259 100644 --- a/lib-src/FileDialog/mac/FileDialogPrivate.mm +++ b/lib-src/FileDialog/mac/FileDialogPrivate.mm @@ -661,6 +661,9 @@ int FileDialog::ShowModal() void FileDialog::ModalFinishedCallback(void* panel, int returnCode) { + m_paths.Clear(); + m_fileNames.Clear(); + int result = wxID_CANCEL; if (HasFlag(wxFD_SAVE)) { diff --git a/src/Project.cpp b/src/Project.cpp index 161b334bf..53beb8d41 100644 --- a/src/Project.cpp +++ b/src/Project.cpp @@ -2397,12 +2397,7 @@ wxArrayString AudacityProject::ShowOpenDialog(wxString extraformat, wxString ext // Construct and display the file dialog wxArrayString selected; -#if defined(__WXMSW__reenable_if_new_filtering_does_not_work) - // Make sure you build wxWidgets with filedlgg.cpp enabled in core/generic - wxGenericFileDialog dlog(NULL, -#else FileDialog dlog(NULL, -#endif _("Select one or more audio files..."), path, wxT(""),