[Bf-blender-cvs] [c6d11f8c13e] asset-engine: Fix crash when opening a .blend file with an opened FileBrowser editor.

Bastien Montagne noreply at git.blender.org
Wed Oct 11 20:38:46 CEST 2017


Commit: c6d11f8c13e1d3d04f6a6e61f1242fd1d4797f0e
Author: Bastien Montagne
Date:   Wed Oct 11 10:08:54 2017 +0200
Branches: asset-engine
https://developer.blender.org/rBc6d11f8c13e1d3d04f6a6e61f1242fd1d4797f0e

Fix crash when opening a .blend file with an opened FileBrowser editor.

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

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

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

diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index 4cca2d7b7ee..e7f5ad7d109 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -1533,6 +1533,9 @@ void filelist_assetengine_set(struct FileList *filelist, struct AssetEngineType
 
 AssetEngine *ED_filelist_assetengine_get(SpaceFile *sfile)
 {
+	if (sfile->files == NULL) {  /* Can happen at file opening if a filebrowser editor is opened in file. */
+		return NULL;
+	}
 	return sfile->files->ae;
 }



More information about the Bf-blender-cvs mailing list