[Bf-blender-cvs] [8cf0d15b602] master: Fix T93508: Shift+F1 to switch to asset browser randomly crashes
Julian Eisel
noreply at git.blender.org
Tue Nov 30 14:35:34 CET 2021
Commit: 8cf0d15b6021280b70b8cc51016e9754f67dd13e
Author: Julian Eisel
Date: Tue Nov 30 14:35:02 2021 +0100
Branches: master
https://developer.blender.org/rB8cf0d15b6021280b70b8cc51016e9754f67dd13e
Fix T93508: Shift+F1 to switch to asset browser randomly crashes
===================================================================
M source/blender/editors/space_file/file_ops.c
===================================================================
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index 15bb7917924..34fad2bcbdb 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -1413,8 +1413,13 @@ int file_highlight_set(SpaceFile *sfile, ARegion *region, int mx, int my)
return 0;
}
- numfiles = filelist_files_ensure(sfile->files);
params = ED_fileselect_get_active_params(sfile);
+ /* In case #SpaceFile.browse_mode just changed, the area may be pending a refresh still, which is
+ * what creates the params for the current browse mode. See T93508. */
+ if (!params) {
+ return false;
+ }
+ numfiles = filelist_files_ensure(sfile->files);
origfile = params->highlight_file;
More information about the Bf-blender-cvs
mailing list