From 858f58fde54652e8695fca0469d44d68678bbc8f Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Fri, 12 Jul 2024 22:45:23 +0200 Subject: [PATCH] Fix #124626: Check for Null Area Type for Get_Name & Get_Icon This report demonstrates a time when an area can have a null SpaceType. This just adds an extra check for this. Pull Request: https://projects.blender.org/blender/blender/pulls/124631 --- source/blender/editors/screen/screen_edit.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/editors/screen/screen_edit.cc b/source/blender/editors/screen/screen_edit.cc index fe362a2abfc..08b7661a278 100644 --- a/source/blender/editors/screen/screen_edit.cc +++ b/source/blender/editors/screen/screen_edit.cc @@ -907,7 +907,7 @@ void ED_screen_exit(bContext *C, wmWindow *window, bScreen *screen) blender::StringRefNull ED_area_name(const ScrArea *area) { - if (area->type->space_name_get) { + if (area->type && area->type->space_name_get) { return area->type->space_name_get(area); } @@ -918,7 +918,7 @@ blender::StringRefNull ED_area_name(const ScrArea *area) int ED_area_icon(const ScrArea *area) { - if (area->type->space_icon_get) { + if (area->type && area->type->space_icon_get) { return area->type->space_icon_get(area); }