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

Fix crash using "~" in the file selector when the "home" is null

Browse Source
This commit is contained in:
Campbell Barton
2024-10-07 13:00:52 +11:00
parent e0f036f8f3
commit ff9d9711d7
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/space_file/file_ops.cc
View File

@@ -2764,12 +2764,18 @@ static void file_expand_directory(bContext *C)
/* While path handling expansion typically doesn't support home directory expansion
* in Blender, this is a convenience to be able to type in a single character.
* Even though this is a UNIX convention, it's harmless to expand on WIN32 as well. */
char tmpstr[sizeof(params->dir) - 1];
STRNCPY(tmpstr, params->dir + 1);
BLI_path_join(params->dir, sizeof(params->dir), BKE_appdir_folder_home(), tmpstr);
if (const char *home_dir = BKE_appdir_folder_home()) {
char tmpstr[sizeof(params->dir) - 1];
STRNCPY(tmpstr, params->dir + 1);
BLI_path_join(params->dir, sizeof(params->dir), home_dir, tmpstr);
}
else {
/* Fall back to the default root. */
params->dir[0] = '\0';
}
}
else if (params->dir[0] == '\0')
if (params->dir[0] == '\0')
#ifndef WIN32
{
params->dir[0] = '/';