diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-01-01 01:09:26 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-01-01 01:09:26 +0400 |
| commit | cc3adc2202ce0208b1c95bc3fe3f0290b3b511f9 (patch) | |
| tree | 503d6bc4376b27a6efe73739609e9bbb1f1188cb /source/blender/editors/space_file | |
| parent | 0896a227232f741b6028219a208ae60e78515406 (diff) | |
| parent | b5595298d36a5023cc33ed41463fd6c032f2ec7b (diff) | |
Merged changes in the trunk up to revision 43038.
Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c
Diffstat (limited to 'source/blender/editors/space_file')
| -rw-r--r-- | source/blender/editors/space_file/filesel.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c index 65473bde0d1..1d629ad6dea 100644 --- a/source/blender/editors/space_file/filesel.c +++ b/source/blender/editors/space_file/filesel.c @@ -667,9 +667,13 @@ void autocomplete_file(struct bContext *C, char *str, void *UNUSED(arg_v)) void ED_fileselect_clear(struct bContext *C, struct SpaceFile *sfile) { - thumbnails_stop(sfile->files, C); - filelist_freelib(sfile->files); - filelist_free(sfile->files); + /* only NULL in rare cases - [#29734] */ + if (sfile->files) { + thumbnails_stop(sfile->files, C); + filelist_freelib(sfile->files); + filelist_free(sfile->files); + } + sfile->params->active_file = -1; WM_event_add_notifier(C, NC_SPACE|ND_SPACE_FILE_LIST, NULL); } |