[Bf-blender-cvs] [99974d27881] asset-browser: Fix crash when splitting area with invisible file browser data

Julian Eisel noreply at git.blender.org
Thu Dec 10 20:30:51 CET 2020


Commit: 99974d27881811c4b35b247da146f6bd42d807f1
Author: Julian Eisel
Date:   Thu Dec 10 20:11:04 2020 +0100
Branches: asset-browser
https://developer.blender.org/rB99974d27881811c4b35b247da146f6bd42d807f1

Fix crash when splitting area with invisible file browser data

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

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

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

diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c
index 3188cedaee5..cba695ca5eb 100644
--- a/source/blender/editors/space_file/space_file.c
+++ b/source/blender/editors/space_file/space_file.c
@@ -195,19 +195,17 @@ static SpaceLink *file_duplicate(SpaceLink *sl)
   sfilen->previews_timer = NULL;
   sfilen->smoothscroll_timer = NULL;
 
+  FileSelectParams *active_params_old = ED_fileselect_get_active_params(sfileo);
+  if (active_params_old) {
+    sfilen->files = filelist_new(active_params_old->type);
+    filelist_setdir(sfilen->files, active_params_old->dir);
+  }
+
   if (sfileo->params) {
     sfilen->params = MEM_dupallocN(sfileo->params);
-    filelist_setdir(sfilen->files, sfilen->params->dir);
   }
-
   if (sfileo->asset_params) {
     sfilen->asset_params = MEM_dupallocN(sfileo->asset_params);
-    filelist_setdir(sfilen->files, sfilen->asset_params->base_params.dir);
-  }
-
-  FileSelectParams *active_params = ED_fileselect_get_active_params(sfilen);
-  if (active_params) {
-    sfilen->files = filelist_new(active_params->type);
   }
 
   sfilen->folder_histories = folder_history_list_duplicate(&sfileo->folder_histories);



More information about the Bf-blender-cvs mailing list