griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T102132: Directory selection fails to add trailing slash

Browse Source 
Regression in [0], accessing the path from the file selector relied on
BLI_join_dirfile adding a trailing "/" when the filename was empty.

[0]: 9f6a045e23
This commit is contained in:
Campbell Barton
2022-10-30 15:24:41 +11:00
parent d1d2f002c7
commit 5d77c3a6a5
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/space_file/file_ops.c
View File

@@ -1564,7 +1564,13 @@ void file_sfile_to_operator_ex(
PropertyRNA *prop;
/* XXX, not real length */
BLI_path_join(filepath, FILE_MAX, params->dir, params->file);
if (params->file[0]) {
BLI_path_join(filepath, FILE_MAX, params->dir, params->file);
}
else {
BLI_strncpy(filepath, params->dir, FILE_MAX - 1);
BLI_path_slash_ensure(filepath);
}
if ((prop = RNA_struct_find_property(op->ptr, "relative_path"))) {
if (RNA_property_boolean_get(op->ptr, prop)) {