[Bf-blender-cvs] [4fe739a5856] asset-browser: Fix crash when showing search menu outside of File/Asset Browser

Julian Eisel noreply at git.blender.org
Fri Nov 20 23:50:16 CET 2020


Commit: 4fe739a5856a616474beebd7e784c5f631cf24c5
Author: Julian Eisel
Date:   Fri Nov 20 23:49:48 2020 +0100
Branches: asset-browser
https://developer.blender.org/rB4fe739a5856a616474beebd7e784c5f631cf24c5

Fix crash when showing search menu outside of File/Asset Browser

===================================================================

M	source/blender/editors/space_file/filesel.c

===================================================================

diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c
index ec118372a86..dbe5abba4d2 100644
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@ -383,6 +383,11 @@ FileSelectParams *ED_fileselect_ensure_active_params(SpaceFile *sfile)
  */
 FileSelectParams *ED_fileselect_get_active_params(const SpaceFile *sfile)
 {
+  if (!sfile) {
+    /* Sometimes called in poll before space type was checked. */
+    return NULL;
+  }
+
   switch ((eFileBrowse_Mode)sfile->browse_mode) {
     case FILE_BROWSE_MODE_FILES:
       return sfile->params;



More information about the Bf-blender-cvs mailing list