From df4f3bd4e233a6376ecb9039d76f52f45438d1d5 Mon Sep 17 00:00:00 2001
From: Leland Lucius <github@homerow.net>
Date: Fri, 17 Jul 2020 20:44:03 -0500
Subject: [PATCH] AUP3: "All supported files" filter missing AUP3 extension

---
 src/ProjectManager.cpp |  2 +-
 src/import/Import.cpp  | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/ProjectManager.cpp b/src/ProjectManager.cpp
index c4b6e14ea..67d2e6f36 100644
--- a/src/ProjectManager.cpp
+++ b/src/ProjectManager.cpp
@@ -871,7 +871,7 @@ void ProjectManager::OnOpenAudioFile(wxCommandEvent & event)
 void ProjectManager::OpenFiles(AudacityProject *proj)
 {
    auto selectedFiles =
-      ProjectFileManager::ShowOpenDialog( FileNames::AudacityProjects );
+      ProjectFileManager::ShowOpenDialog();
    if (selectedFiles.size() == 0) {
       Importer::SetLastOpenType({});
       return;
diff --git a/src/import/Import.cpp b/src/import/Import.cpp
index 1c8e9e7e4..debc9ed29 100644
--- a/src/import/Import.cpp
+++ b/src/import/Import.cpp
@@ -181,14 +181,13 @@ Importer::GetFileTypes( const FileNames::FileType &extraType )
    FileNames::FileTypes fileTypes{
       FileNames::AllFiles,
       // Will fill in the list of extensions later:
-      { XO("All supported files"), {} }
+      { XO("All supported files"), {} },
+      FileNames::AudacityProjects
    };
 
    if ( !extraType.extensions.empty() )
       fileTypes.push_back( extraType );
-   else
-      fileTypes.push_back(FileNames::AudacityProjects);
-   
+ 
    FileNames::FileTypes l;
    for(const auto &importPlugin : sImportPluginList())
    {
@@ -196,8 +195,14 @@ Importer::GetFileTypes( const FileNames::FileType &extraType )
                                importPlugin->GetSupportedExtensions());
    }
 
+   FileExtensions extraExtensions = FileNames::AudacityProjects.extensions;
+   extraExtensions.insert(extraExtensions.end(),
+                          extraType.extensions.begin(),
+                          extraType.extensions.end());
+
    using ExtensionSet = std::unordered_set< FileExtension >;
-   FileExtensions allList = extraType.extensions, newList;
+   FileExtensions allList = FileNames::AudacityProjects.extensions, newList;
+   allList.insert(allList.end(), extraType.extensions.begin(), extraType.extensions.end());
    ExtensionSet allSet{ allList.begin(), allList.end() }, newSet;
    for ( const auto &format : l ) {
       newList.clear();