Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2026-03-15 10:55:20 +01:00
Code Issues Releases Wiki Activity

Fix inconsistencies in default extension passed to SelectFile...

Browse Source 
... It must be empty, or else one extension not including the leading dot;
then correct the string passed to FileSelector in lib-src, which should be
a filename pattern
This commit is contained in:
Paul Licameli
2019-12-27 11:44:58 -05:00
parent ccefe8da5f
commit 3f88df06ec
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/FileNames.cpp
View File

@@ -465,14 +465,17 @@ FileNames::SelectFile(Operation op,
const TranslatableString& message,
const FilePath& default_path,
const FilePath& default_filename,
const wxString& default_extension,
const FileExtension& default_extension,
const wxString& wildcard,
int flags,
wxWindow *parent)
{
return WithDefaultPath(op, default_path, [&](const FilePath &path) {
wxString filter;
if ( !default_extension.empty() )
filter = wxT("*.") + default_extension;
return FileSelector(
message.Translation(), path, default_filename, default_extension,
message.Translation(), path, default_filename, filter,
wildcard, flags, parent, wxDefaultCoord, wxDefaultCoord);
});
}
@@ -624,7 +627,7 @@ char *FileNames::VerifyFilename(const wxString &s, bool input)
wxEmptyString,
name,
ext,
wxT("*.") + ext,
ext.empty() ? wxT("*") : (wxT("*.") + ext),
wxFD_SAVE | wxRESIZE_BORDER,
wxGetTopLevelParent(NULL));
}