mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-06 06:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix file selector not allowing choosing files by path

Browse Source
This commit is contained in:
Adrijaned 2020-02-09 17:42:46 +01:00
parent 47a568ee86
commit 90ba6d77dd
1 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/app/ui/file_selector.cpp
View File

@ -613,38 +613,33 @@ again:
}
// else file-name specified in the entry is really a file to open...
// check if the filename doesn't contain slashes or other ilegal characters...
bool has_invalid_char = (fn.find('/') != std::string::npos);
#ifdef _WIN32
has_invalid_char =
has_invalid_char ||
(fn.find('\\') != std::string::npos ||
fn.find(':') != std::string::npos ||
fn.find('*') != std::string::npos ||
fn.find('?') != std::string::npos ||
fn.find('\"') != std::string::npos ||
fn.find('<') != std::string::npos ||
fn.find('>') != std::string::npos ||
fn.find('|') != std::string::npos);
#endif
if (has_invalid_char) {
const char* invalid_chars =
"/"
#ifdef _WIN32
" \\ : * ? \" < > |"
#endif
;
// check if the filename doesn't contain ilegal characters...
// Only if it does not exist
// Only on Windows, Linux disallows only `/`, and we can consider that just an embedded path if present
if (!enter_folder) {
bool has_invalid_char =
fn.find(':') != std::string::npos ||
fn.find('*') != std::string::npos ||
fn.find('?') != std::string::npos ||
fn.find('\"') != std::string::npos ||
fn.find('<') != std::string::npos ||
fn.find('>') != std::string::npos ||
fn.find('|') != std::string::npos);
if (has_invalid_char) {
const char *invalid_chars = "/ \\ : * ? \" < > |";
ui::Alert::show(
fmt::format(
Strings::alerts_invalid_chars_in_filename(),
invalid_chars));
ui::Alert::show(
fmt::format(
Strings::alerts_invalid_chars_in_filename(),
invalid_chars));
// show the window again
setVisible(true);
goto again;
// show the window again
setVisible(true);
goto again;
}
}
#endif
// does it not have extension? ...we should add the extension
// selected in the filetype combo-box
if (!buf.empty() && base::get_file_extension(buf).empty()) {