From 8668006519e39c0fcaf2e3f2b5e508eb8478e2e4 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 11 Feb 2015 11:16:32 +0100 Subject: Fix crasher in own UIList bookmarks commit. Immediate crash in merged asset-experiments branch, no idea why it did not show in master too? --- source/blender/editors/space_file/space_file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/space_file/space_file.c b/source/blender/editors/space_file/space_file.c index 6612d5ee937..3c60233d0a9 100644 --- a/source/blender/editors/space_file/space_file.c +++ b/source/blender/editors/space_file/space_file.c @@ -260,7 +260,8 @@ static void file_refresh(const bContext *C, ScrArea *sa) sfile->layout->dirty = true; } - if (BKE_area_find_region_type(sa, RGN_TYPE_TOOLS) == NULL) { + /* Might be called with NULL sa, see file_main_area_draw() below. */ + if (sa && BKE_area_find_region_type(sa, RGN_TYPE_TOOLS) == NULL) { /* Create TOOLS/TOOL_PROPS regions. */ file_tools_region(sa); -- cgit v1.2.3