blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Fix Asset Browser crash with undo in "Current File" library with sidebar 

When the Asset Browser was showing the "Current File" repository and the
sidebar was open, undoing could crash, because the context API returned freed
data.

Don't let context return anything if a refresh is pending due to data changes
like undo/redo.
This commit is contained in:
Julian Eisel 2020-12-14 23:01:24 +01:00
parent 68e4a90240
commit 9caeb9dfc7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/space_file/space_file.c
View File

@ -790,12 +790,18 @@ static int /*eContextResult*/ file_context(const bContext *C,
CTX_data_dir_set(result, file_context_dir);
return CTX_RESULT_OK;
}
else if (CTX_data_equals(member, "active_file")) {
/* The following member checks return file-list data, check if that needs refreshing first. */
if (file_main_region_needs_refresh_before_draw(sfile)) {
return CTX_RESULT_NO_DATA;
}
if (CTX_data_equals(member, "active_file")) {
FileDirEntry *file = filelist_file(sfile->files, params->active_file);
CTX_data_pointer_set(result, &screen->id, &RNA_FileSelectEntry, file);
return CTX_RESULT_OK;
}
else if (CTX_data_equals(member, "active_id")) {
if (CTX_data_equals(member, "active_id")) {
const FileDirEntry *file = filelist_file(sfile->files, params->active_file);
ID *id = filelist_file_get_id(file);
@ -804,6 +810,7 @@ static int /*eContextResult*/ file_context(const bContext *C,
}
return CTX_RESULT_OK;
}
return CTX_RESULT_MEMBER_NOT_FOUND;
}