[Bf-blender-cvs] [91504ed26e4] master: Fix assert using '//' on an unsaved file

[Campbell Barton]

Commit: 91504ed26e426445637a6aa73455052618ff0875
Author: Campbell Barton
Date:   Tue May 15 17:27:36 2018 +0200
Branches: master
https://developer.blender.org/rB91504ed26e426445637a6aa73455052618ff0875

Fix assert using '//' on an unsaved file

Annoying for debug builds.

===================================================================

M	source/blender/editors/space_file/file_ops.c

===================================================================

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];