diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-15 18:27:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-15 18:27:36 +0300 |
| commit | 91504ed26e426445637a6aa73455052618ff0875 (patch) | |
| tree | 4ee293b5fd5e85aa837ef9139ac138a054880c45 /source | |
| parent | 3eb9cc69f2005755224fcc4ad44aafaa4e7cd40c (diff) | |
Fix assert using '//' on an unsaved file
Annoying for debug builds.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_file/file_ops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index 217ce8f1d9a..fd998807106 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -1843,9 +1843,9 @@ static void file_expand_directory(bContext *C) SpaceFile *sfile = CTX_wm_space_file(C); if (sfile->params) { - /* TODO, what about // when relbase isn't valid? */ - if (G.relbase_valid && BLI_path_is_rel(sfile->params->dir)) { - BLI_path_abs(sfile->params->dir, G.main->name); + if (BLI_path_is_rel(sfile->params->dir)) { + /* Use of 'default' folder here is just to avoid an error message on '//' prefix. */ + BLI_path_abs(sfile->params->dir, G.relbase_valid ? G.main->name : BKE_appdir_folder_default()); } else if (sfile->params->dir[0] == '~') { char tmpstr[sizeof(sfile->params->dir) - 1]; |