diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-06-07 03:58:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-06-07 03:58:30 +0400 |
| commit | 5c685b7f9974ce2384a3ae0d69573931781a86eb (patch) | |
| tree | 9fa3a0527a18d0356015456e0958e19c41cf7612 /source/blender/editors/space_file/filesel.c | |
| parent | b0a9b44240862b335678f81844c3a8695c853240 (diff) | |
change to r57261, replace BLI_cleanup_dir with BLI_split_dir_part
Diffstat (limited to 'source/blender/editors/space_file/filesel.c')
| -rw-r--r-- | source/blender/editors/space_file/filesel.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index 0410307ba94..25d865d857b 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -254,8 +254,19 @@ short ED_fileselect_set_params(SpaceFile *sfile) /* initialize the list with previous folders */ if (!sfile->folders_prev) sfile->folders_prev = folderlist_new(); - if (!sfile->params->dir[0]) - BLI_cleanup_dir(G.main->name, sfile->params->dir); + + if (!sfile->params->dir[0]) { + if (G.main->name[0]) { + BLI_split_dir_part(G.main->name, sfile->params->dir, sizeof(sfile->params->dir)); + } + else { + const char *doc_path = BLI_getDefaultDocumentFolder(); + if (doc_path) { + BLI_strncpy(sfile->params->dir, doc_path, sizeof(sfile->params->dir)); + } + } + } + folderlist_pushdir(sfile->folders_prev, sfile->params->dir); /* switching thumbnails needs to recalc layout [#28809] */ |