diff options
author | Andrea Weikert <elubie@gmx.net> | 2009-09-13 12:08:50 +0400 |
---|---|---|
committer | Andrea Weikert <elubie@gmx.net> | 2009-09-13 12:08:50 +0400 |
commit | 7eea0b647cbfa7cadec14b07b696bf10830189e8 (patch) | |
tree | b6772d15261e8de671efe5c04fbfc62b66718cb7 /source/blender/editors/space_file/filesel.c | |
parent | b1e418db20cb854a933f0dcf9689a9104b99be7d (diff) |
2.5 filebrowser
Fix crash when loading old files with filebrowser UI
Partial Fix for invoking filebrowser via spacetype pupmenu: reset directory in filelist
Make paths relative in 'path' return when requested by 'relative_paths' property in operator
Diffstat (limited to 'source/blender/editors/space_file/filesel.c')
-rw-r--r-- | source/blender/editors/space_file/filesel.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index e22e9f8e023..f226b3de260 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -117,6 +117,8 @@ short ED_fileselect_set_params(SpaceFile *sfile) BLI_strncpy(sfile->params->file, file, sizeof(sfile->params->file)); BLI_make_file_string(G.sce, sfile->params->dir, dir, ""); /* XXX needed ? - also solve G.sce */ } + + ED_fileselect_reset_params(sfile); params = sfile->params; @@ -173,13 +175,17 @@ short ED_fileselect_set_params(SpaceFile *sfile) } /* new params, refresh file list */ - if(sfile->files) filelist_free(sfile->files); + if(sfile->files) { + filelist_free(sfile->files); + filelist_setdir(sfile->files, params->dir); + } return 1; } void ED_fileselect_reset_params(SpaceFile *sfile) { + sfile->params->type = FILE_UNIX; sfile->params->flag = 0; sfile->params->title[0] = '\0'; } |