From 754838844d21fda9286aaf79c8e72c10e017cb1d Mon Sep 17 00:00:00 2001 From: Leland Lucius Date: Sat, 30 Jan 2021 04:13:56 -0600 Subject: [PATCH] Bug 119 - Linux: Export Multiple: "*" and "?" in label or track name wrongly rejected --- src/Internat.cpp | 8 +++++++- src/export/ExportMultiple.cpp | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Internat.cpp b/src/Internat.cpp index a6411ac50..a0332f39f 100644 --- a/src/Internat.cpp +++ b/src/Internat.cpp @@ -103,8 +103,14 @@ void Internat::Init() // or to directories auto forbid = wxFileName::GetForbiddenChars(format); - for(auto cc: forbid) + for (auto cc: forbid) { +#if defined(__WXGTK__) + if (cc == wxT('*') || cc == wxT('?')) { + continue; + } +#endif exclude.push_back(wxString{ cc }); + } // The path separators may not be forbidden, so add them //auto separators = wxFileName::GetPathSeparators(format); diff --git a/src/export/ExportMultiple.cpp b/src/export/ExportMultiple.cpp index aec86034b..f5f092718 100644 --- a/src/export/ExportMultiple.cpp +++ b/src/export/ExportMultiple.cpp @@ -1143,7 +1143,7 @@ wxString ExportMultipleDialog::MakeFileName(const wxString &input) if( excluded.length() > 1 ){ msg = XO( // i18n-hint: The second %s gives some letters that can't be used. -"Label or track \"%s\" is not a legal file name. You cannot use\nthese characters:\n\n%s\n\nSuggested replacement:") +"Label or track \"%s\" is not a legal file name.\nYou cannot use any of these characters:\n\n%s\n\nSuggested replacement:") .Format( input, excluded ); } else { msg = XO(