From 91504ed26e426445637a6aa73455052618ff0875 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 15 May 2018 17:27:36 +0200 Subject: Fix assert using '//' on an unsaved file Annoying for debug builds. --- source/blender/editors/space_file/file_ops.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source') 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]; -- cgit v1.2.3