diff options
author | Andrea Weikert <elubie@gmx.net> | 2010-04-29 22:53:01 +0400 |
---|---|---|
committer | Andrea Weikert <elubie@gmx.net> | 2010-04-29 22:53:01 +0400 |
commit | cbc2a71128156d2caac653df5cb021e819fd159a (patch) | |
tree | 333018ee07e5201c9b087e13503f199837d2ed59 /source/blender/editors/space_file/space_file.c | |
parent | df2ed9fa3bb5e2dbea0428a27a5ba901027e52ec (diff) |
[#22133] File Browser Mismatches File Name and Thumbnail
* sorting of file list interfered with thumbnail order, stopping job while sorting now.
Diffstat (limited to 'source/blender/editors/space_file/space_file.c')
-rw-r--r-- | source/blender/editors/space_file/space_file.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c index 4edc3268fcb..efdd8cb0db1 100644 --- a/source/blender/editors/space_file/space_file.c +++ b/source/blender/editors/space_file/space_file.c @@ -195,13 +195,24 @@ static void file_refresh(const bContext *C, ScrArea *sa) filelist_setfilter(sfile->files, params->flag & FILE_FILTER ? params->filter : 0); if (filelist_empty(sfile->files)) { + thumbnails_stop(sfile->files, C); filelist_readdir(sfile->files); - thumbnails_start(sfile->files, C); + if(params->sort!=FILE_SORT_NONE) { + filelist_sort(sfile->files, params->sort); + } BLI_strncpy(params->dir, filelist_dir(sfile->files), FILE_MAX); + thumbnails_start(sfile->files, C); } else { filelist_filter(sfile->files); + if(params->sort!=FILE_SORT_NONE) { + thumbnails_stop(sfile->files, C); + filelist_sort(sfile->files, params->sort); + thumbnails_start(sfile->files, C); + } else { + filelist_filter(sfile->files); + } + } - if(params->sort!=FILE_SORT_NONE) filelist_sort(sfile->files, params->sort); if (params->renamefile[0] != '\0') { int idx = filelist_find(sfile->files, params->renamefile); |